diff --git a/src/pages/details/otherBussStandardDetails/index.vue b/src/pages/details/otherBussStandardDetails/index.vue
index ec2303410..8556ce49f 100644
--- a/src/pages/details/otherBussStandardDetails/index.vue
+++ b/src/pages/details/otherBussStandardDetails/index.vue
@@ -334,7 +334,7 @@
                 <el-button v-else @click="collectClick()" title="收藏" class="collection-btn" icon="el-icon-star-off" :loading="isSubmit"></el-button>
                 <el-button class="relation-btn" icon="icon-relation" @click="relateEvent()">更新记录</el-button>
                 <el-button class="relation-btn" icon="icon-relation" @click="knowledgeSharing">标准问答</el-button>
-                <el-button class="relation-btn" icon="icon-relation" @click="knowledgeSharing">标准需求（翻译）申请流程</el-button>
+                <el-button v-if="false" class="relation-btn" icon="icon-relation" @click="knowledgeSharing">标准需求（翻译）申请流程</el-button>
               </div>
             </div>
           </div>
@@ -2962,16 +2962,56 @@ export default {
       this.relateDialog1 = true
       this.relateNowList1 = list
     },
+    selectAskReply(){
+      return new Promise((resolve,reject)=>{
+        this.$http.post('lawss/AskQuestions/selectAskReply', {
+          id: this.$route.params.id
+        }, {
+          _this: this
+        }, res => {
+          resolve(res)
+        },e => reject(e));
+      })
+    },
     //标准问答按钮
     knowledgeSharing() {
-      this.$router.push({
-        path: '/standQA',
-        query:{
-          standId: this.$route.params.id,
-          standType: 'BUSINESS_STAND',
-          sourceType: 'details',
-        }
+      this.selectAskReply()
+          .then((res)=>{
+            if( res && res.data.length === 0){
+              this.$router.push({
+                name: 'MyQuestions3',
+                query: {
+                  activeName: "myQue",
+                  type: this.$route.params.pageType,
+                  id: this.$route.params.id,
+                  dialogVisible: true
+                },
+              })
+            }else{
+              const data = res.data[0].askQuestions
+              this.$router.push({
+                name: 'MyQuestions3',
+                query: {
+                  activeName: "myQue",
+                  classification: data.classification,
+                  id: this.$route.params.id,
+                  dialogVisible: false
+                },
+              })
+            }
+          }).catch(e =>{
+        console.log(e)
       })
+
+      // this.$router.push({
+      //   // path: '/standQA',
+      //   query: {
+      //     standId: this.$route.params.id,
+      //     standType: this.sarStandardsInfoEO.standType,
+      //     sourceType: 'details',
+      //   },
+      //   name: 'MyQuestions2',
+      // })
     },
     // 更新LOG
     relateEvent () {
diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue
index a504c20cb..297ccbe34 100644
--- a/src/pages/details/otherStandardDetails/index.vue
+++ b/src/pages/details/otherStandardDetails/index.vue
@@ -37,7 +37,7 @@
                            @click="collectClick()"></el-button>
                 <el-button class="relation-btn" icon="icon-relation" @click="relateEvent()">更新记录</el-button>
                 <el-button class="relation-btn" @click="knowledgeSharing">标准问答</el-button>
-                <el-button class="relation-btn" @click="">标准需求（翻译）申请流程</el-button>
+                <el-button v-if="false" class="relation-btn" @click="">标准需求（翻译）申请流程</el-button>
               </div>
             </div>
           </div>
@@ -2634,16 +2634,57 @@ export default {
     pageSizeChange1() {
       this.getKnowList()
     },
+    selectAskReply(){
+      return new Promise((resolve,reject)=>{
+        this.$http.post('lawss/AskQuestions/selectAskReply', {
+          id: this.$route.params.id
+        }, {
+          _this: this
+        }, res => {
+          resolve(res)
+        },e => reject(e));
+      })
+    },
     //标准问答按钮
     knowledgeSharing() {
-      this.$router.push({
-        path: '/standQA',
-        query: {
-          standId: this.$route.params.id,
-          standType: this.sarStandardsInfoEO.standType,
-          sourceType: 'details',
-        }
-      })
+      this.selectAskReply()
+          .then((res)=>{
+            if( res && res.data.length === 0){
+              this.$router.push({
+                name: 'MyQuestions3',
+                query: {
+                  activeName: "myQue",
+                  type: this.$route.params.pageType,
+                  id: this.$route.params.id,
+                  dialogVisible: true
+                },
+              })
+            }else{
+              const data = res.data[0].askQuestions
+              this.$router.push({
+                name: 'MyQuestions3',
+                query: {
+                  activeName: "myQue",
+                  type: this.$route.params.pageType,
+                  // classification: data.classification,
+                  id: this.$route.params.id,
+                  dialogVisible: false
+                },
+              })
+            }
+          }).catch(e =>{
+            console.log(e)
+          })
+
+      // this.$router.push({
+      //   // path: '/standQA',
+      //   query: {
+      //     standId: this.$route.params.id,
+      //     standType: this.sarStandardsInfoEO.standType,
+      //     sourceType: 'details',
+      //   },
+      //   name: 'MyQuestions2',
+      // })
     },
     // 获取知识点列表数据
     getKnowList() {
diff --git a/src/pages/home2/components/todoList/index.vue b/src/pages/home2/components/todoList/index.vue
index f1170da41..39023f501 100644
--- a/src/pages/home2/components/todoList/index.vue
+++ b/src/pages/home2/components/todoList/index.vue
@@ -1,6 +1,6 @@
 <!-- 待办任务 -->
 <template>
-  <div class="to-do-list">
+  <div class="to-do-list" v-loading="Loading">
     <div style="border-bottom: 2px solid #f4f4f4">
       <span class="task">
         <i class="el-icon-s-goods"></i> 待办任务
@@ -9,18 +9,21 @@
     </div>
     <ul>
       <li v-for="item in toDoTaskList" :key="item.id" class="time-title">
-        <div style="min-height: 30px">
-          <span @click="dealWith(item)"
-                style="line-height: 30px; font-size: 13px;display: inline-block;width: 100%;">{{ getPrcNameFilter(item) }}</span>
-          <el-button type="primary"
-                     size="small"
-                     class="common-button-primary"
-                     icon="el-icon-check"
-                     @click="handleReceive(item)" v-if="item.showreceive && ((item.prcType == 25 && item.taskInfo == '技术标准起草') || (item.prcType == 3 && item.taskInfo == '意见反馈') ||
+        <div style="min-height: 30px;display: flex;justify-content: space-between">
+         <div>
+            <span @click="dealWith(item)"
+                  style="line-height: 30px; font-size: 13px;"
+            >{{ getPrcNameFilter(item) }}</span>
+         </div>
+          <div>
+            <el-button type="primary"
+                       size="small"
+                       @click="handleReceive(item)" v-if="item.showreceive && ((item.prcType == 25 && item.taskInfo == '技术标准起草') || (item.prcType == 3 && item.taskInfo == '意见反馈') ||
                      (item.prcType == 9 && item.taskInfo == '解读') || (item.prcType == 6 && item.taskInfo === '合规评估') || (item.prcType == 6 && item.taskInfo == '批准') ||
                      (item.prcType == 2 && item.taskInfo === '调研结果反馈') || (item.prcType == 8 && item.taskInfo === '合规排查(上传合规举证材料)') ||
                      (item.prcType == 10 && item.taskInfo === '清单完善1') || (item.prcType == 26 && item.taskInfo === '立项确认') ||
-                     (item.prcType == 'buss3' && item.taskInfo === '复审'))? true : false">接受任务</el-button>
+                     (item.prcType == 'buss3' && item.taskInfo === '复审'))? true : false">接受</el-button>
+          </div>
 <!--          <el-tooltip class="item" effect="dark" :content="getPrcNameFilter(item)" placement="left" v-else>-->
 <!--            <span @click="dealWith(item)"-->
 <!--                  style="line-height: 30px; font-size: 13px;">{{ getPrcNameFilter(item).substring(0, 32) + '...' }}</span>-->
@@ -42,6 +45,7 @@ export default {
       total: 0,
       pageNo: 1,
       showreceive:true,
+      Loading:false
     }
   },
   computed: {},
@@ -73,6 +77,7 @@ export default {
     },
     // 接受按钮
     handleReceive(item) {
+      this.Loading = true
       this.isSubmit = true
       // execTask({
       //   todoId: this.todoId // 当前节点ID
@@ -106,9 +111,31 @@ export default {
           this.showreceive = false
           //   this.$router.push('/processCenter')
           // }
+          this.queryProcessPrmise().then(() => {
+            this.Loading = false
+          })
+
         })
       })
     },
+    queryProcessPrmise () { // 查询待办流程
+      return new Promise((resolve,reject)=>{
+        this.$http.postData('lawss/activiti/todoTaskList', {
+              current: this.pageNo,
+              size: 10,
+              userId: this.$store.getters.userInfo.usid || this.$store.getters.userInfo.userId,
+            },
+            {
+              loading: 'loading',
+              _this: this
+            }, res => {
+              this.toDoTaskList = res.list
+              resolve()
+            }, e => {
+              reject()
+            })
+      })
+    },
     dealWith (row) { // 办理
       const prcType = row.prcType
       switch(prcType) {
diff --git a/src/pages/localTool/standAutoSplit/index.vue b/src/pages/localTool/standAutoSplit/index.vue
index 1d9e12ba9..cfc506b33 100644
--- a/src/pages/localTool/standAutoSplit/index.vue
+++ b/src/pages/localTool/standAutoSplit/index.vue
@@ -30,7 +30,7 @@
       <div class="action-bar">
         <el-button size="small" type="primary" @click="spiltStandFile" v-btn-permission="'633d92e841ab4d49fb57b48b45fd0db8'">拆分</el-button>
         <el-button size="small" type="danger" @click="batchDelete" v-btn-permission="'e214975dcab66d2e27bf2ed9897f521c'">删除</el-button>
-        <el-button size="small" type="primary" @click="clickButtonToImport" v-btn-permission="'449d7543121f8588b0bddc4038d14863'">导入拆分结果</el-button>
+        <el-button size="small" type="primary" @click="clickButtonToImport">导入拆分结果</el-button>
       </div>
       <div class="table-wrap">
         <div style="position: absolute;height: 100%;width: 100%;">
diff --git a/src/pages/personal/pages/my-questions/index3.vue b/src/pages/personal/pages/my-questions/index3.vue
new file mode 100644
index 000000000..432644d86
--- /dev/null
+++ b/src/pages/personal/pages/my-questions/index3.vue
@@ -0,0 +1,2143 @@
+<!--我的问答-->
+<template>
+<div id="my-questions">
+   <div class="search-area">
+     <el-form :inline="true" :model="questionSerach" >
+       <el-form-item class="el-form-item search-item" label="标准号">
+         <el-input v-model="questionSerach.standardEncdoing" placeholder="根据标准号查询"></el-input>
+       </el-form-item>
+       <el-form-item class="el-form-item search-item" label="标准名称">
+         <el-input v-model="questionSerach.standardName" placeholder="根据标准名称查询"></el-input>
+       </el-form-item>
+       <el-form-item class="el-form-item search-item" label="关键词">
+         <el-input v-model="questionSerach.problemDescription" placeholder="根据关键词查询"></el-input>
+       </el-form-item>
+       <el-form-item>
+         <el-button size="mini"  @click="searchBtn">查询</el-button>
+       </el-form-item>
+       <el-form-item>
+         <el-button size="mini"  @click="delSearch">清空</el-button>
+       </el-form-item>
+       <el-form-item>
+         <el-button v-if="activeName === 'myQue'" size="mini" type="primary" @click="queBtn">提问</el-button>
+       </el-form-item>
+     </el-form>
+   </div>
+  <div class="tab-box">
+    <el-tabs
+      type="border-card"
+      style="height: 100%"
+      class="type-tabs"
+      v-model="activeName"
+      @tab-click="handleClick"
+      tab-position="left"
+    >
+      <el-tab-pane name="myQue" label="我的提问">
+        <div style="height: 100%" v-if="activeName === 'myQue'">
+          <el-tabs
+            class="question-tabs"
+            type="border-card"
+            v-model="activeType"
+            @tab-click="sourceClick"
+            style="height: 100%"
+            tab-position="left">
+            <el-tab-pane name="INLAND" label="国内标准">
+              <div v-if="!standList || standList.length === 0">
+                <div style="padding: 20px;">
+                  暂无数据
+                </div>
+              </div>
+              <div style="height: 100%" v-else-if="activeType === 'INLAND'">
+                <el-tabs
+                  class="question-box"
+                  type="border-card"
+                  v-model="activestand"
+                  @tab-click="standClick"
+                  style="height: 100%"
+                  tab-position="left"
+                >
+                  <template v-for="stand in standList">
+                    <el-tab-pane class="com-box" :name="stand.standardId">
+                      <template slot="label">
+                        <stand-item :stand="stand"></stand-item>
+                      </template>
+                      <div v-if="!questionsList || questionsList.length === 0">
+                        <div style="padding: 20px;">
+                        暂无数据
+                      </div>
+                      </div>
+                      <div style="height: 100%" v-else>
+                        <el-tabs
+                          v-loading="tagsLoading"
+                          class="question-box"
+                          type="border-card"
+                          style="height: 100%"
+                          v-model="activeQue"
+                          @tab-click="questionClick"
+                          tab-position="left"
+                        >
+                          <template v-for="question in questionsList">
+                            <el-tab-pane class="com-box" :name="question.id">
+                              <template slot="label">
+                                <questions-item :question="question"></questions-item>
+                              </template>
+                              <div class="contentClass">
+                                <template v-for="(item, index) in answerList">
+                                  <div class="clearfix">
+                                    <div class="answer-box" >
+                                      <question-item-info :answer="item" :fileList="fileListSetFunc(item)"></question-item-info>
+                                    </div>
+                                  </div>
+                                </template>
+                                <loading :loading="dataLoading">正在加载数据</loading>
+                              </div>
+                            </el-tab-pane>
+                          </template>
+                        </el-tabs>
+                      </div>
+                    </el-tab-pane>
+                  </template>
+                </el-tabs>
+              </div>
+            </el-tab-pane>
+            <el-tab-pane name="FOREIGN" label="海外标准">
+              <div v-if="!standList || standList.length === 0">
+                <div style="padding: 20px;">
+                  暂无数据
+                </div>
+              </div>
+              <div style="height: 100%"  v-else-if="activeType === 'FOREIGN'">
+                <el-tabs
+                  class="question-box"
+                  type="border-card"
+                  v-model="activestand"
+                  @tab-click="standClick"
+                  style="height: 100%"
+                  tab-position="left"
+                >
+                  <template v-for="stand in standList">
+                    <el-tab-pane class="com-box" :name="stand.standardId">
+                      <template slot="label">
+                        <stand-item :stand="stand"></stand-item>
+                      </template>
+                      <div v-if="!questionsList || questionsList.length === 0">
+                        <div style="padding: 20px;">
+                          暂无数据
+                        </div>
+                      </div>
+                      <div style="height: 100%" v-else>
+                        <el-tabs
+                          v-loading="tagsLoading"
+                          class="question-box"
+                          type="border-card"
+                          style="height: 100%"
+                          v-model="activeQue"
+                          @tab-click="questionClick"
+                          tab-position="left"
+                        >
+                          <template v-for="question in questionsList">
+                            <el-tab-pane class="com-box" :name="question.id">
+                              <template slot="label">
+                                <questions-item :question="question"></questions-item>
+                              </template>
+                              <div class="contentClass">
+                                <template v-for="(item, index) in answerList">
+                                  <div class="clearfix">
+                                    <div class="answer-box" >
+                                      <question-item-info :answer="item" :fileList="fileListSetFunc(item)"></question-item-info>
+                                    </div>
+                                  </div>
+                                </template>
+                                <loading :loading="dataLoading">正在加载数据</loading>
+                              </div>
+                            </el-tab-pane>
+                          </template>
+                        </el-tabs>
+                      </div>
+                    </el-tab-pane>
+                  </template>
+                </el-tabs>
+              </div>
+            </el-tab-pane>
+            <el-tab-pane name="BUSINESS_STAND" label="企业标准">
+              <div v-if="!standList || standList.length === 0">
+                <div style="padding: 20px;">
+                  暂无数据
+                </div>
+              </div>
+              <div style="height: 100%" v-else-if="activeType === 'BUSINESS_STAND'">
+                <el-tabs
+                  class="question-box"
+                  type="border-card"
+                  v-model="activestand"
+                  @tab-click="standClick"
+                  style="height: 100%"
+                  tab-position="left"
+                >
+                  <template v-for="stand in standList">
+                    <el-tab-pane class="com-box" :name="stand.standardId">
+                      <template slot="label">
+                        <stand-item :stand="stand"></stand-item>
+                      </template>
+                      <div v-if="!questionsList || questionsList.length === 0">
+                        <div style="padding: 20px;">
+                          暂无数据
+                        </div>
+                      </div>
+                      <div style="height: 100%" v-else>
+                        <el-tabs
+                          v-loading="tagsLoading"
+                          class="question-box"
+                          type="border-card"
+                          style="height: 100%"
+                          v-model="activeQue"
+                          @tab-click="questionClick"
+                          tab-position="left"
+                        >
+                          <template v-for="question in questionsList">
+                            <el-tab-pane class="com-box" :name="question.id">
+                              <template slot="label">
+                                <questions-item :question="question"></questions-item>
+                              </template>
+                              <div class="contentClass">
+                                <template v-for="(item, index) in answerList">
+                                  <div class="clearfix">
+                                    <div class="answer-box" >
+                                      <question-item-info :answer="item" :fileList="fileListSetFunc(item)"></question-item-info>
+                                    </div>
+                                  </div>
+                                </template>
+                                <loading :loading="dataLoading">正在加载数据</loading>
+                              </div>
+                            </el-tab-pane>
+                          </template>
+                        </el-tabs>
+                      </div>
+                    </el-tab-pane>
+                  </template>
+                </el-tabs>
+              </div>
+            </el-tab-pane>
+            <el-tab-pane name="OTHER" label="公共问题">
+              <div v-if="!standList || standList.length === 0">
+                <div style="padding: 20px;">
+                  暂无数据
+                </div>
+              </div>
+              <div style="height: 100%" v-else-if="activeType === 'OTHER'">
+                <el-tabs
+                  class="question-box"
+                  type="border-card"
+                  v-model="activestand"
+                  @tab-click="standClick"
+                  style="height: 100%"
+                  tab-position="left"
+                >
+                  <template v-for="stand in standList">
+                    <el-tab-pane class="com-box" :name="stand.standardId">
+                      <template slot="label">
+                        <stand-item :stand="stand"></stand-item>
+                      </template>
+                      <div v-if="!questionsList || questionsList.length === 0">
+                        <div style="padding: 20px;">
+                          暂无数据
+                        </div>
+                      </div>
+                      <div style="height: 100%" v-else>
+                        <el-tabs
+                                v-loading="tagsLoading"
+                          class="question-box"
+                          type="border-card"
+                          style="height: 100%"
+                          v-model="activeQue"
+                          @tab-click="questionClick"
+                          tab-position="left"
+                        >
+                          <template v-for="question in questionsList">
+                            <el-tab-pane class="com-box" :name="question.id">
+                              <template slot="label">
+                                <questions-item :question="question"></questions-item>
+                              </template>
+                              <div class="contentClass">
+                                <template v-for="(item, index) in answerList">
+                                  <div class="clearfix">
+                                    <div class="answer-box" >
+                                      <question-item-info :answer="item" :fileList="fileListSetFunc(item)"></question-item-info>
+                                    </div>
+                                  </div>
+                                </template>
+                                <loading :loading="dataLoading">正在加载数据</loading>
+                              </div>
+                            </el-tab-pane>
+                          </template>
+                        </el-tabs>
+                      </div>
+                    </el-tab-pane>
+                  </template>
+                </el-tabs>
+              </div>
+            </el-tab-pane>
+          </el-tabs>
+        </div>
+      </el-tab-pane>
+      <el-tab-pane name="myAns" label="我的回答">
+        <div style="height: 100%" v-if="activeName === 'myAns'">
+          <el-tabs
+            class="question-tabs"
+            type="border-card"
+            v-model="activeType"
+            @tab-click="sourceClick2"
+            style="height: 100%"
+            tab-position="left">
+            <el-tab-pane name="INLAND" label="国内标准">
+              <div v-if="!standList || standList.length === 0">
+                <div style="padding: 20px;">
+                  暂无数据
+                </div>
+              </div>
+              <div style="height: 100%" v-else-if="activeType === 'INLAND'">
+                <el-tabs
+                  class="question-box"
+                  type="border-card"
+                  v-model="activestand"
+                  @tab-click="standClick2"
+                  style="height: 100%"
+                  tab-position="left"
+                >
+                  <template v-for="stand in standList">
+                    <el-tab-pane class="com-box" :name="stand.standardId">
+                      <template slot="label">
+                        <stand-item :stand="stand"></stand-item>
+                      </template>
+                      <div v-if="!questionsList || questionsList.length === 0">
+                        <div style="padding: 20px;">
+                          暂无数据
+                        </div>
+                      </div>
+                      <div style="height: 100%" v-else>
+                        <el-tabs v-loading="tagsLoading"
+                          class="question-box"
+                          type="border-card"
+                          v-model="activeQue"
+                          style="height: 100%"
+                          @tab-click="questionClick"
+                          tab-position="left"
+                        >
+                          <template v-for="question in questionsList">
+                            <el-tab-pane class="com-box" :name="question.id">
+                              <template slot="label">
+                                <questions-item :question="question"></questions-item>
+                              </template>
+                              <div class="ansBox">
+                                <template v-for="(item, index) in answerList">
+                                  <div class="clearfix">
+                                    <div class="answer-box" >
+                                      <question-item-info :key="qiiKey"
+                                                          :answer="item"
+                                                          :fileList="fileListSetFunc(item)"
+                                                          :questionerForm="question"></question-item-info>
+                                    </div>
+                                  </div>
+                                </template>
+                                <loading :loading="dataLoading">正在加载数据</loading>
+                              </div>
+                              <div class="info-answer">
+                                <answer-item :key="aiKey" :list="answerList" @roleFlagBoo="roleFlagBooFunc" @emitInsState="emitInsState"></answer-item>
+                              </div>
+                            </el-tab-pane>
+                          </template>
+                        </el-tabs>
+                      </div>
+                    </el-tab-pane>
+                  </template>
+                </el-tabs>
+              </div>
+            </el-tab-pane>
+            <el-tab-pane name="FOREIGN" label="海外标准">
+              <div v-if="!standList || standList.length === 0">
+                <div style="padding: 20px;">
+                  暂无数据
+                </div>
+              </div>
+              <div style="height: 100%" v-else-if="activeType === 'FOREIGN'">
+                <el-tabs
+                  class="question-box"
+                  type="border-card"
+                  v-model="activestand"
+                  @tab-click="standClick2"
+                  style="height: 100%"
+                  tab-position="left"
+                >
+                  <template v-for="stand in standList">
+                    <el-tab-pane class="com-box" :name="stand.standardId">
+                      <template slot="label">
+                        <stand-item :stand="stand"></stand-item>
+                      </template>
+                      <div v-if="!questionsList || questionsList.length === 0">
+                        <div style="padding: 20px;">
+                          暂无数据
+                        </div>
+                      </div>
+                      <div style="height: 100%" v-else>
+                        <el-tabs v-loading="tagsLoading"
+                          class="question-box"
+                          type="border-card"
+                          v-model="activeQue"
+                          style="height: 100%"
+                          @tab-click="questionClick"
+                          tab-position="left"
+                        >
+                          <template v-for="question in questionsList">
+                            <el-tab-pane class="com-box" :name="question.id">
+                              <template slot="label">
+                                <questions-item :question="question"></questions-item>
+                              </template>
+                              <div class="ansBox">
+                                <template v-for="(item, index) in answerList">
+                                  <div class="clearfix">
+                                    <div class="answer-box" >
+                                      <question-item-info :key="qiiKey"
+                                                          :answer="item"
+                                                          :fileList="fileListSetFunc(item)"
+                                                          :questionerForm="question"></question-item-info>
+                                    </div>
+                                  </div>
+                                </template>
+                                <loading :loading="dataLoading">正在加载数据</loading>
+                              </div>
+                              <div class="info-answer">
+                                <answer-item :key="aiKey" :list="answerList" @roleFlagBoo="roleFlagBooFunc"  @emitInsState="emitInsState"></answer-item>
+                              </div>
+                            </el-tab-pane>
+                          </template>
+                        </el-tabs>
+                      </div>
+                    </el-tab-pane>
+                  </template>
+                </el-tabs>
+              </div>
+            </el-tab-pane>
+            <el-tab-pane name="BUSINESS_STAND"  label="企业标准">
+              <div v-if="!standList || standList.length === 0">
+                <div style="padding: 20px;">
+                  暂无数据
+                </div>
+              </div>
+              <div style="height: 100%" v-else-if="activeType === 'BUSINESS_STAND'">
+                <el-tabs
+                  class="question-box"
+                  type="border-card"
+                  v-model="activestand"
+                  @tab-click="standClick2"
+                  style="height: 100%"
+                  tab-position="left"
+                >
+                  <template v-for="stand in standList">
+                    <el-tab-pane class="com-box" :name="stand.standardId">
+                      <template slot="label">
+                        <stand-item :stand="stand"></stand-item>
+                      </template>
+                      <div v-if="!questionsList || questionsList.length === 0">
+                        <div style="padding: 20px;">
+                          暂无数据
+                        </div>
+                      </div>
+                      <div style="height: 100%" v-else>
+                        <el-tabs v-loading="tagsLoading"
+                          class="question-box"
+                          type="border-card"
+                          v-model="activeQue"
+                          style="height: 100%"
+                          @tab-click="questionClick"
+                          tab-position="left"
+                        >
+                          <template v-for="question in questionsList">
+                            <el-tab-pane class="com-box" :name="question.id">
+                              <template slot="label">
+                                <questions-item :question="question"></questions-item>
+                              </template>
+                              <div class="ansBox">
+                                <template v-for="(item, index) in answerList">
+                                  <div class="clearfix">
+                                    <div class="answer-box" >
+                                      <question-item-info :key="qiiKey"
+                                                          :answer="item"
+                                                          :fileList="fileListSetFunc(item)"
+                                                          :questionerForm="question"></question-item-info>
+                                    </div>
+                                  </div>
+                                </template>
+                                <loading :loading="dataLoading">正在加载数据</loading>
+                              </div>
+                              <div class="info-answer">
+                                <answer-item :key="aiKey" :list="answerList" @roleFlagBoo="roleFlagBooFunc"  @emitInsState="emitInsState"></answer-item>
+                              </div>
+                            </el-tab-pane>
+                          </template>
+                        </el-tabs>
+                      </div>
+                    </el-tab-pane>
+                  </template>
+                </el-tabs>
+              </div>
+            </el-tab-pane>
+            <el-tab-pane name="OTHER"  label="公共问题">
+              <div v-if="!standList || standList.length === 0">
+                <div style="padding: 20px;">
+                  暂无数据
+                </div>
+              </div>
+              <div style="height: 100%" v-else-if="activeType === 'OTHER'">
+                <el-tabs
+                  class="question-box"
+                  type="border-card"
+                  v-model="activestand"
+                  @tab-click="standClick2"
+                  style="height: 100%"
+                  tab-position="left"
+                >
+                  <template v-for="stand in standList">
+                    <el-tab-pane class="com-box" :name="stand.standardId">
+                      <template slot="label">
+                        <stand-item :stand="stand"></stand-item>
+                      </template>
+                      <div v-if="!questionsList || questionsList.length === 0">
+                        <div style="padding: 20px;">
+                          暂无数据
+                        </div>
+                      </div>
+                      <div style="height: 100%" v-else>
+                        <el-tabs v-loading="tagsLoading"
+                          class="question-box"
+                          type="border-card"
+                          v-model="activeQue"
+                          style="height: 100%"
+                          @tab-click="questionClick"
+                          tab-position="left"
+                        >
+                          <template v-for="question in questionsList">
+                            <el-tab-pane class="com-box" :name="question.id">
+                              <template slot="label">
+                                <questions-item :question="question"></questions-item>
+                              </template>
+                              <div class="ansBox">
+                                <template v-for="(item, index) in answerList">
+                                  <div class="clearfix">
+                                    <div class="answer-box" >
+                                      <question-item-info
+                                      :key="qiiKey"
+                                      :answer="item"
+                                      :questionerForm="question"
+                                      :fileList="fileListSetFunc(item)"
+                                      ></question-item-info>
+                                    </div>
+                                  </div>
+                                </template>
+                                <loading :loading="dataLoading">正在加载数据</loading>
+                              </div>
+                              <div class="info-answer">
+                                <answer-item :key="aiKey" :list="answerList" @roleFlagBoo="roleFlagBooFunc" @emitInsState="emitInsState"></answer-item>
+                              </div>
+                            </el-tab-pane>
+                          </template>
+                        </el-tabs>
+                      </div>
+                    </el-tab-pane>
+                  </template>
+                </el-tabs>
+              </div>
+            </el-tab-pane>
+          </el-tabs>
+        </div>
+      </el-tab-pane>
+      <el-tab-pane name="mySub" label="我的订阅">
+        <div style="height: 100%" v-if="activeName === 'mySub'">
+          <el-tabs
+            class="question-tabs"
+            type="border-card"
+            v-model="activeType"
+            @tab-click="sourceClick3"
+            style="height: 100%"
+            tab-position="left">
+            <el-tab-pane name="INLAND" label="国内标准">
+              <div v-if="!standList || standList.length === 0">
+                <div style="padding: 20px;">
+                  暂无数据
+                </div>
+              </div>
+              <div style="height: 100%" v-else-if="activeType === 'INLAND'">
+                <el-tabs
+                  class="question-box"
+                  type="border-card"
+                  v-model="activestand"
+                  @tab-click="standClick3"
+                  style="height: 100%"
+                  tab-position="left"
+                >
+                  <template v-for="stand in standList">
+                    <el-tab-pane class="com-box" :name="stand.standardId">
+                      <template slot="label">
+                        <stand-item :stand="stand"></stand-item>
+                      </template>
+                      <div v-if="!questionsList || questionsList.length === 0">
+                        <div style="padding: 20px;">
+                          暂无数据
+                        </div>
+                      </div>
+                      <div style="height: 100%" v-else>
+                        <el-tabs v-loading="tagsLoading"
+                          class="question-box"
+                          type="border-card"
+                          style="height: 100%"
+                          v-model="activeQue"
+                          @tab-click="questionClick"
+                          tab-position="left"
+                        >
+                          <template v-for="question in questionsList">
+                            <el-tab-pane class="com-box" :name="question.id">
+                              <template slot="label">
+                                <questions-item :question="question"></questions-item>
+                              </template>
+                              <div class="contentClass">
+                                <template v-for="(item, index) in answerList">
+                                  <div class="clearfix">
+                                    <div class="answer-box" >
+                                      <question-item-info :answer="item" :fileList="fileListSetFunc(item)"></question-item-info>
+                                    </div>
+                                  </div>
+                                </template>
+                                <loading :loading="dataLoading">正在加载数据</loading>
+                              </div>
+                            </el-tab-pane>
+                          </template>
+                        </el-tabs>
+                      </div>
+                    </el-tab-pane>
+                  </template>
+                </el-tabs>
+              </div>
+            </el-tab-pane>
+            <el-tab-pane name="FOREIGN" label="海外标准">
+              <div v-if="!standList || standList.length === 0">
+                <div style="padding: 20px;">
+                  暂无数据
+                </div>
+              </div>
+              <div style="height: 100%" v-else-if="activeType === 'FOREIGN'">
+                <el-tabs
+                  class="question-box"
+                  type="border-card"
+                  v-model="activestand"
+                  @tab-click="standClick3"
+                  style="height: 100%"
+                  tab-position="left"
+                >
+                  <template v-for="stand in standList">
+                    <el-tab-pane class="com-box" :name="stand.standardId">
+                      <template slot="label">
+                        <stand-item :stand="stand"></stand-item>
+                      </template>
+                      <div v-if="!questionsList || questionsList.length === 0">
+                        <div style="padding: 20px;">
+                          暂无数据
+                        </div>
+                      </div>
+                      <div style="height: 100%" v-else>
+                        <el-tabs v-loading="tagsLoading"
+                          class="question-box"
+                          type="border-card"
+                          style="height: 100%"
+                          v-model="activeQue"
+                          @tab-click="questionClick"
+                          tab-position="left"
+                        >
+                          <template v-for="question in questionsList">
+                            <el-tab-pane class="com-box" :name="question.id">
+                              <template slot="label">
+                                <questions-item :question="question"></questions-item>
+                              </template>
+                              <div class="contentClass">
+                                <template v-for="(item, index) in answerList">
+                                  <div class="clearfix">
+                                    <div class="answer-box" >
+                                      <question-item-info :answer="item" :fileList="fileListSetFunc(item)"></question-item-info>
+                                    </div>
+                                  </div>
+                                </template>
+                              </div>
+                              <loading :loading="dataLoading">正在加载数据</loading>
+                            </el-tab-pane>
+                          </template>
+                        </el-tabs>
+                      </div>
+                    </el-tab-pane>
+                  </template>
+                </el-tabs>
+              </div>
+            </el-tab-pane>
+            <el-tab-pane name="BUSINESS_STAND" label="企业标准">
+              <div v-if="!standList || standList.length === 0">
+                <div style="padding: 20px;">
+                  暂无数据
+                </div>
+              </div>
+              <div style="height: 100%" v-else-if="activeType === 'BUSINESS_STAND'">
+                <el-tabs
+                  class="question-box"
+                  type="border-card"
+                  v-model="activestand"
+                  @tab-click="standClick3"
+                  style="height: 100%"
+                  tab-position="left"
+                >
+                  <template v-for="stand in standList">
+                    <el-tab-pane class="com-box" :name="stand.standardId">
+                      <template slot="label">
+                        <stand-item :stand="stand"></stand-item>
+                      </template>
+                      <div v-if="!questionsList || questionsList.length === 0">
+                        <div style="padding: 20px;">
+                          暂无数据
+                        </div>
+                      </div>
+                      <div style="height: 100%" v-else>
+                        <el-tabs v-loading="tagsLoading"
+                          class="question-box"
+                          type="border-card"
+                          style="height: 100%"
+                          v-model="activeQue"
+                          @tab-click="questionClick"
+                          tab-position="left"
+                        >
+                          <template v-for="question in questionsList">
+                            <el-tab-pane class="com-box" :name="question.id">
+                              <template slot="label">
+                                <questions-item :question="question"></questions-item>
+                              </template>
+                              <div class="contentClass">
+                                <template v-for="(item, index) in answerList">
+                                  <div class="clearfix">
+                                    <div class="answer-box" >
+                                      <question-item-info :answer="item" :fileList="fileListSetFunc(item)"></question-item-info>
+                                    </div>
+                                  </div>
+                                </template>
+                                <loading :loading="dataLoading">正在加载数据</loading>
+                              </div>
+                            </el-tab-pane>
+                          </template>
+                        </el-tabs>
+                      </div>
+                    </el-tab-pane>
+                  </template>
+                </el-tabs>
+              </div>
+            </el-tab-pane>
+            <el-tab-pane name="OTHER" label="公共问题">
+              <div v-if="!standList || standList.length === 0">
+                <div style="padding: 20px;">
+                  暂无数据
+                </div>
+              </div>
+              <div style="height: 100%" v-else-if="activeType === 'OTHER'">
+                <el-tabs
+                  class="question-box"
+                  type="border-card"
+                  v-model="activestand"
+                  @tab-click="standClick3"
+                  style="height: 100%"
+                  tab-position="left"
+                >
+                  <template v-for="stand in standList">
+                    <el-tab-pane class="com-box" :name="stand.standardId">
+                      <template slot="label">
+                        <stand-item :stand="stand"></stand-item>
+                      </template>
+                      <div v-if="!questionsList || questionsList.length === 0">
+                        <div style="padding: 20px;">
+                          暂无数据
+                        </div>
+                      </div>
+                      <div style="height: 100%" v-else>
+                        <el-tabs v-loading="tagsLoading"
+                          class="question-box"
+                          type="border-card"
+                          style="height: 100%"
+                          v-model="activeQue"
+                          @tab-click="questionClick"
+                          tab-position="left"
+                        >
+                          <template v-for="question in questionsList">
+                            <el-tab-pane class="com-box" :name="question.id">
+                              <template slot="label">
+                                <questions-item :question="question"></questions-item>
+                              </template>
+                              <div class="contentClass">
+                                <template v-for="(item, index) in answerList">
+                                  <div class="clearfix">
+                                    <div class="answer-box" >
+                                      <question-item-info :answer="item" :fileList="fileListSetFunc(item)"></question-item-info>
+                                    </div>
+                                  </div>
+                                </template>
+                                <loading :loading="dataLoading">正在加载数据</loading>
+                              </div>
+                            </el-tab-pane>
+                          </template>
+                        </el-tabs>
+                      </div>
+                    </el-tab-pane>
+                  </template>
+                </el-tabs>
+              </div>
+            </el-tab-pane>
+          </el-tabs>
+        </div>
+      </el-tab-pane>
+    </el-tabs>
+  </div>
+  <!--提问弹窗  -->
+  <el-dialog
+    title="提交问题"
+    :visible.sync="dialogVisible"
+    width="650px"
+    :before-close="handleClose">
+    <div>
+      <el-form ref="queForm" :rules="queRules" class="label-input-form" label-width="80px" :model="questionForm">
+        <el-form-item  label-width="30px" >
+          <el-radio-group v-model="standType" @change="standTypeChange">
+            <el-radio  label="INLAND">国内标准</el-radio>
+            <el-radio  label="FOREIGN">海外标准</el-radio>
+            <el-radio  label="BUSINESS_STAND">企业标准</el-radio>
+            <el-radio  label="OTHER">公共</el-radio>
+          </el-radio-group>
+          <div style="display: inline-block; margin-left: 20px"  v-if="standType === 'OTHER'">
+            <el-select v-model="questionForm.pubQue" placeholder="请选择公共问题">
+              <el-option
+                v-for="item in pubOptions"
+                :key="item.label"
+                :label="item.label"
+                :value="item.label">
+              </el-option>
+            </el-select>
+          </div>
+          <el-button v-else size="mini" style="margin-left: 30px;" type="primary" @click="addList">选择标准</el-button>
+        </el-form-item>
+        <el-form-item label="标准号" class="serch-form-item">
+          {{ questionForm.standSortShow }} {{questionForm.standNumber }}-{{ questionForm.standYear }}
+        </el-form-item>
+        <el-form-item label="标准名称" class="serch-form-item">
+          {{questionForm.standardName}}
+        </el-form-item>
+        <el-form-item label="问题" prop="problemDescription"  class="serch-form-item">
+          <el-input v-model="questionForm.problemDescription"  @input="changeInput"></el-input>
+        </el-form-item>
+        <el-form-item label="附件">
+          <el-upload
+            class="upload-demo"
+            drag
+            :file-list="fileList"
+            :action="actionPath"
+            accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx, .pdf, .PDF"
+            :before-upload="beforeUploadTheme"
+            :before-remove="beforeRemoveTheme"
+            :on-success="onsuccessTheme"
+            multiple>
+            <div style="margin-top: 10px">
+              <i class="el-icon-upload" style="margin: 0"></i>
+              <div class="el-upload__text" style="margin-top: -15px">将文件拖到此处，或<em>点击上传</em></div>
+            </div>
+          </el-upload>
+        </el-form-item>
+      </el-form>
+    </div>
+    <span>相似历史问题：</span>
+    <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>
+      </div>
+    </div>
+    <span slot="footer" class="dialog-footer">
+    <el-button class="common-button-default" size="mini" @click="dialogVisible = false">取 消</el-button>
+    <el-button class="common-button-primary" size="mini" type="primary" :loading="submitBtnLoading" @click="queSubmit">提 交</el-button>
+    </span>
+  </el-dialog>
+  <!--    选择标准抽屉-->
+  <el-drawer
+    class="drawer-table"
+    title="选择标准"
+    :wrapperClosable="false"
+    :visible.sync="standModel"
+    size="900px"
+    custom-class="demo-drawer"
+  >
+    <div class="demo-drawer-content">
+      <el-form
+        class="label-input-form"
+        style="margin-top: 15px;"
+        label-width="130px"
+        :modal="handleSelectForm"
+        :inline="true"
+      >
+        <el-form-item label="标准/政策来源" class="search-item">
+          <el-select
+            v-model="handleSelectForm.dataSource"
+            @change="dataSourceChange"
+            :popper-append-to-body="false"
+            placeholder="请选择标准来源">
+            <el-option value="INLAND" label="国内标准库"></el-option>
+            <el-option value="FOREIGN" label="海外标准库"></el-option>
+            <el-option value="BUSINESS_STAND" label="企业标准库"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="标准号/标准名称" class="search-item">
+          <el-input
+            v-model="handleSelectForm.lawNumber"
+            placeholder="根据标准号/标准名称查找"
+            clearable
+            :maxlength="100"></el-input>
+        </el-form-item>
+        <el-form-item class="search-item btn-box">
+          <el-button
+            size="small"
+            type="primary"
+            class="common-button-primary"
+            @click="searchLawBtn">
+            查询
+          </el-button>
+        </el-form-item>
+        <el-form-item class="search-item btn-box">
+          <el-button
+            class="common-button-default"
+            size="small"
+            type="default"
+            @click="clearLawBtn">
+            清空
+          </el-button>
+        </el-form-item>
+      </el-form>
+      <loading :loading="lawInfoTableLoading">数据获取中</loading>
+      <el-table
+        ref="selections"
+        tooltip-effect="dark"
+        style="width: 100%;"
+        border
+        :loading="lawInfoTableLoading"
+        :data="lawInfoTable"
+        :height="300"
+        :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
+          fontWeight: 'bold', height: '48px'}"
+        @selection-change="handleSelectTableChange"
+      >
+
+        <el-table-column
+          fixed="left"
+          type="selection"
+          width="55"
+          align="center">
+        </el-table-column>
+
+        <div v-if="handleSelectForm.dataSource === 'INLAND'">
+          <el-table-column
+            label="标准号"
+            width="150"
+          >
+            <template slot-scope="scope">
+              <a v-if="scope.row.standYear && textStatusMap[scope.row.textStatus] === '废止'" class="table-jump" style="color: #F56C6C"
+                 @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{
+                  scope.row.standNumber
+                }}-{{ scope.row.standYear }}</a>
+              <a v-else-if="scope.row.standYear" class="table-jump" style="color: #333333"
+                 @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{
+                  scope.row.standNumber
+                }}-{{ scope.row.standYear }}</a>
+              <a v-else @click="handlePreview(scope.row)" class="table-jump" style="color: #333333">
+                {{ scope.row.standSortShow }}
+                {{ scope.row.standNumber }}</a>
+            </template>
+          </el-table-column>
+          <el-table-column
+            show-overflow-tooltip
+            prop="standName"
+            label="标准名称"
+            min-width="300"
+          >
+            <template slot-scope="scope">
+              <a v-if="textStatusMap[scope.row.textStatus] === '废止' " @click="handlePreview(scope.row)" class="table-jump" style="color: #F56C6C">{{ scope.row.standName }}</a>
+              <a v-else @click="handlePreview(scope.row)" style="color: #333333" class="table-jump">{{ scope.row.standName }}</a>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="issueTime"
+            width="120"
+            label="发布日期">
+            <template slot-scope="scope">
+              <span v-if="textStatusMap[scope.row.textStatus] === '废止'" style="color: #F56C6C">{{ formatIssueDate(scope.row.issueTime) }}</span>
+              <span v-else>{{ formatIssueDate(scope.row.issueTime) }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="ssrq"
+            width="120"
+            label="实施日期">
+            <template slot-scope="scope">
+              <!--                {{ formatIssueDate(scope.row.putTime) }}-->
+              <span v-if="textStatusMap[scope.row.textStatus] === '废止' " style="color: #F56C6C">{{ scope.row.SSRQ ? scope.row.SSRQ.substring(0, 10) : '-' }}</span>
+              <span v-else>{{ scope.row.ssrq }}</span>
+
+            </template>
+          </el-table-column>
+
+          <el-table-column
+            prop="xcxssrq"
+            width="150"
+            label="新车型实施日期">
+            <template slot-scope="scope">
+              <span v-if="textStatusMap[scope.row.textStatus] === '废止' " style="color: #F56C6C">{{ scope.row.xcxssrq ? scope.row.xcxssrq.substring(0, 10) : '-' }}</span>
+              <span v-else>{{ scope.row.xcxssrq }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="zccssrq"
+            width="150"
+            label="在产车实施日期">
+            <template slot-scope="scope">
+              <span v-if="textStatusMap[scope.row.textStatus] === '废止' " style="color: #F56C6C">{{ scope.row.zccssrq ? scope.row.zccssrq.substring(0, 10) : '-' }}</span>
+              <span v-else>{{ scope.row.zccssrq }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="textStatus"
+            width="110"
+            label="文本状态">
+            <template slot-scope="scope">
+                <span v-if="textStatusMap[scope.row.textStatus] === '废止' " style="color: #F56C6C">{{
+                    textStatusMap[scope.row.textStatus]
+                  }}</span>
+              <span v-else>{{ textStatusMap[scope.row.textStatus] }}</span>
+            </template>
+          </el-table-column>
+        </div>
+        <div v-if="handleSelectForm.dataSource === 'FOREIGN'">
+          <el-table-column
+            label="标准号"
+            width="150"
+          >
+            <template slot-scope="scope">
+              <a v-if="scope.row.standYear && textStatusMap[scope.row.textStatus] === '废止'" style="color: #F56C6C" class="table-jump" @click="handlePreview(scope.row)">{{
+                  scope.row.standSortShow
+                }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>
+              <a v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF" class="table-jump" @click="handlePreview(scope.row)">{{
+                  scope.row.standSortShow
+                }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>
+              <a v-else-if="scope.row.standYear" style="color: #333333" class="table-jump" @click="handlePreview(scope.row)">{{
+                  scope.row.standSortShow
+                }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>
+              <a v-else style="color: #333333" @click="handlePreview(scope.row)" class="table-jump">{{
+                  scope.row.standSortShow
+                }}
+                {{ scope.row.standNumber }}</a>
+            </template>
+          </el-table-column>
+          <el-table-column
+            show-overflow-tooltip
+            prop="standName"
+            label="标准名称"
+            min-width="300"
+          >
+            <template slot-scope="scope">
+              <a v-if="textStatusMap[scope.row.textStatus] === '废止'" style="color: #F56C6C" @click="handlePreview(scope.row)" class="table-jump">{{
+                  scope.row.standName
+                }}</a>
+              <a v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF" @click="handlePreview(scope.row)" class="table-jump">{{
+                  scope.row.standName
+                }}</a>
+              <a v-else style="color: #333333" @click="handlePreview(scope.row)" class="table-jump">{{
+                  scope.row.standName
+                }}</a>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="issueTime"
+            width="120"
+            label="发布日期">
+            <template slot-scope="scope">
+              <div v-if="textStatusMap[scope.row.textStatus] === '废止'" style="color: #F56C6C">
+                {{ formatIssueDate(scope.row.issueTime) }}
+              </div>
+              <div v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF">
+                {{ formatIssueDate(scope.row.issueTime) }}
+              </div>
+              <div v-else style="color: #333333">
+                {{ formatIssueDate(scope.row.issueTime) }}
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="ssrq"
+            width="120"
+            label="实施日期">
+            <template slot-scope="scope">
+              <!--                {{ formatIssueDate(scope.row.putTime) }}-->
+              <span v-if="textStatusMap[scope.row.textStatus] === '废止' " style="color: #F56C6C">{{
+                  scope.row.ssrq
+                }}</span>
+              <span v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF">{{
+                  scope.row.ssrq
+                }}</span>
+              <span v-else style="color: #333333">{{ scope.row.ssrq }}</span>
+
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="xcxssrq"
+            width="150"
+            label="新车型实施日期">
+            <template slot-scope="scope">
+                <span v-if="textStatusMap[scope.row.textStatus] === '废止'" style="color: #F56C6C">{{
+                    scope.row.xcxssrq
+                  }}</span>
+              <span v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF">{{
+                  scope.row.xcxssrq
+                }}</span>
+              <span v-else style="color: #333333">{{
+                  scope.row.xcxssrq
+                }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="zccssrq"
+            width="150"
+            label="在产车实施日期">
+            <template slot-scope="scope">
+                <span v-if="textStatusMap[scope.row.textStatus] === '废止'" style="color: #F56C6C">{{
+                    scope.row.zccssrq
+                  }}</span>
+              <span v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF">{{
+                  scope.row.zccssrq
+                }}</span>
+              <span v-else style="color: #333333">{{
+                  scope.row.zccssrq
+                }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="textStatus"
+            width="110"
+            label="文本状态">
+            <template slot-scope="scope">
+                <span v-if="textStatusMap[scope.row.textStatus] === '废止'" style="color: #F56C6C">{{
+                    textStatusMap[scope.row.textStatus]
+                  }}</span>
+              <span v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF">{{
+                  textStatusMap[scope.row.textStatus]
+                }}</span>
+              <span v-else style="color: #333333">{{ textStatusMap[scope.row.textStatus] }}</span>
+            </template>
+          </el-table-column>
+        </div>
+        <div v-if="handleSelectForm.dataSource === 'BUSINESS_STAND'">
+          <el-table-column
+            show-overflow-tooltip
+            label="企标编号"
+            width="150"
+          >
+            <template slot-scope="scope">
+              <!--                <a v-if="scope.row.standYear" class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>-->
+              <a v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standCode }}</a>
+              <a v-if="scope.row.standStatusShow === '参考'" style="color: #E6A23C" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standCode }}</a>
+              <a v-if="scope.row.standStatusShow !== '作废' && scope.row.standStatusShow !== '参考'" style="color: #333333" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standCode }}</a>
+            </template>
+          </el-table-column>
+          <el-table-column
+            show-overflow-tooltip
+            prop="standName"
+            label="中文名称"
+            min-width="300"
+          >
+            <template slot-scope="scope">
+              <a v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
+              <a v-if="scope.row.standStatusShow === '参考' " style="color: #E6A23C" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
+              <a v-if="scope.row.standStatusShow !== '作废' && scope.row.standStatusShow !== '参考'" style="color: #333333" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
+            </template>
+          </el-table-column>
+          <el-table-column
+            show-overflow-tooltip
+            prop="standEnName"
+            label="英文名称"
+            min-width="300"
+          >
+            <template slot-scope="scope">
+              <a v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standEnName }}</a>
+              <a v-if="scope.row.standStatusShow === '参考'" style="color: #E6A23C" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standEnName }}</a>
+              <a v-if="scope.row.standStatusShow !== '作废' && scope.row.standStatusShow !== '参考'" style="color: #333333" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standEnName }}</a>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="issueTime"
+            label="发布日期"
+            width="120"
+          >
+            <template slot-scope="scope">
+              <span v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C">{{scope.row.issueTime}}</span>
+              <span v-if="scope.row.standStatusShow === '参考' " style="color: #E6A23C">{{scope.row.issueTime}}</span>
+              <span v-if="scope.row.standStatusShow !== '作废' && scope.row.standStatusShow !== '参考'">{{scope.row.issueTime}}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="putTime"
+            label="实施日期"
+            width="120"
+          >
+            <template slot-scope="scope">
+              <span v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C">{{scope.row.putTime}}</span>
+              <span v-if="scope.row.standStatusShow === '参考'" style="color: #E6A23C">{{scope.row.putTime}}</span>
+              <span v-if="scope.row.standStatusShow !== '作废' && scope.row.standStatusShow !== '参考'">{{scope.row.putTime}}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            show-overflow-tooltip
+            prop="standStatusShow"
+            label="文本状态"
+            width="110"
+          >
+            <template slot-scope="scope">
+                <span v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C">
+                  {{scope.row.standStatusShow}}
+                </span>
+              <span v-if="scope.row.standStatusShow === '参考'" style="color: #E6A23C">
+                  {{scope.row.standStatusShow}}
+                </span>
+              <span v-if="scope.row.standStatusShow !== '作废' && scope.row.standStatusShow !== '参考'">
+                  {{scope.row.standStatusShow}}
+                </span>
+            </template>
+          </el-table-column>
+        </div>
+
+      </el-table>
+      <!--分页-->
+      <pagination
+        v-show="this.lawInfoTableLoading === false"
+        style="position: relative;"
+        :page="handleSelectForm.page"
+        :total="handleSelectForm.total"
+        @pageChange="handleSelectPageChange"
+        @pageSizeChange="handleSelectPageSizeChange"></pagination>
+      <div slot="footer" class="demo-drawer-footer">
+        <el-button class="common-button-default" size="mini"  @click="standModel = false">取消</el-button>
+        <el-button type="primary" size="mini" class="common-button-primary"  @click="handleSelectConfirm" v-show="lawInfoTableLoading === false">确定</el-button>
+      </div>
+    </div>
+  </el-drawer>
+  <!--    选择回答人-->
+  <Role-tree
+          is-title="选择回答人"
+          :is-visible.sync="roleFlag"
+          @checkedRole="checkedRole"
+          :nodeList="nodeList"
+  ></Role-tree>
+</div>
+</template>
+
+<script>
+import questionsItem from './components/questions-item'
+import answerItem from "@/pages/personal/pages/my-questions/components/answerItem";
+import questionItemInfo from "@/pages/personal/pages/my-questions/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: "index",
+  components:{
+    questionItemInfo,
+    questionsItem,
+    answerItem,
+    standItem
+  },
+  data(){
+    return{
+      tagsLoading: false,
+      submitBtnLoading: false,
+      aiKey:1,
+      qiiKey:1,
+      institutionId: this.$store.getters.userInfo.institutionId,
+      dataLoading: true,
+      roleFlag: false,
+      nodeList: [],
+      mergeList: [],
+      historyList: [], //相似历史问题
+      handleSelectForm: {
+        standName: '', //标准名称
+        numberName: '', //政策名称
+        lawsNumber: '', //政策编号
+        standNumber: '', //标准编号
+        standCode: '', //企标编号
+        textStatus: '', //标准状态
+        dataSource: 'INLAND',
+        standType: 'INLAND',
+        lawNumber: '', // 标准编号/政策编号
+        lawName: '', // 标准名称/政策名称
+        page: 1,
+        pageSize: this.$store.getters.userInfo.configContent,
+        bpnId: '',
+        total: 0,
+        quoteIdList: '',
+        validFlag: '0',
+        menuId: 'nomenu'
+      },
+      textStatusMap: {},// 文本状态id与name对应
+      textState: [],
+      standModel: false,
+      lawInfoTableLoading: true,
+      handleSelectTableList: [],
+      lawInfoTable: [],
+      // 上传地址
+      actionPath: 'api/att/attFile/uploadNew',
+      fileList: [], //上传文件的列表
+      activeName: 'myQue',
+      activeType: 'INLAND',
+      activestand: '',
+      activeQue: '',
+      pubOptions: [], //公共问题
+      standType: 'INLAND',
+      dialogVisible: false,
+      questionForm:{
+        pubQue: '', //公共问题
+        classification: 'INLAND', //标准类型
+        problemDescription: '', //问题
+        questioner: this.$store.getters.userInfo.userId, //提问人
+        standardEncdoing: '',  //标准编号
+        standardName: '',   //标准名称
+        standardId:'',   //标准id
+        fileList: '',
+      },
+      queRules:{
+        problemDescription: [
+          {required: true, message: '请输入问题', trigger: 'blur'},
+        ],
+      },
+      questionSerach:{
+        classification: 'INLAND',
+        standardName: '',  //标准名称
+        standardEncdoing: '', //标准编号
+        questioner: this.$store.getters.userInfo.userId,   //提问人
+        problemDescription: '',  //关键词/问题描述
+      },
+      answerList: [],
+      standList: [],
+      questionsList: [],
+      prcName:'',
+      taskIds:'',
+      standMap: new Map()
+    }
+  },
+  mounted(){
+    console.log(this.$route)
+    if(this.$route.query){
+      if(this.$route.query.dialogVisible){
+        this.dialogVisible = true
+        if(this.$route.query.type === 'BUSINESS_STAND'){
+          this.standType = 'BUSINESS_STAND'
+        }else if(this.$route.query.type === 'INLAND_STAND'){
+          this.standType = 'INLAND'
+        }else if(this.$route.query.type === 'FOREIGN_STAND'){
+          this.standType = 'FOREIGN'
+        }
+        let type = this.standType === 'FOREIGN' ? '海外标准' : this.standType === 'INLAND' ? '国内标准' : "企业标准"
+        this.selectById(this.$route.query.id,type).then(res =>{
+          this.handleSelectTableList = [res.data]
+          this.handleSelectConfirm()
+        })
+      }else{
+        this.activeName = this.$route.query.activeName
+        if(this.$route.query.type === 'BUSINESS_STAND'){
+          this.activeType = 'BUSINESS_STAND'
+        }else if(this.$route.query.type === 'INLAND_STAND'){
+          this.activeType = 'INLAND'
+        }else if(this.$route.query.type === 'FOREIGN_STAND'){
+          this.activeType = 'FOREIGN'
+        }
+        // this.activeType = this.$route.query.classification
+        // this.sourceClick()
+        this.activestand = this.$route.query.id
+        // this.standClick()
+        this.searchBtn()
+        this.queSearch();
+      }
+    }
+    if(this.$route.query){
+      var index = this.$route.query.prcName.indexOf('-(')
+      this.prcName = this.$route.query.prcName.substring(0,index)
+      this.taskIds = this.$route.query.taskIds
+    }
+    this.standSearch()
+    // 查询各下拉框数据
+    this.$http.get("sys/dictype/getDicTypeListCode", "", {
+      _this: this,
+      loading: "loading"
+    }, res => {
+      this.setMap(res.data.WBZTCLASS);// 文本状态
+      this.textState = res.data.WBZTCLASS // 文本状态
+      this.pubOptions = res.data.DYGGWT  //问答公共问题
+    }, e => {
+    });
+  },
+  watch:{
+    answerList: {
+      immediate: true,
+      deep: true,
+      handler(val) {
+        this.aiKey++
+        // sessionStorage.setItem('mergeList', JSON.stringify(this.mergeList))
+      }
+    },
+    'questionForm.problemDescription':{
+       handler(val){
+       }
+    }
+  },
+  methods:{
+    selectById(id,type){
+      return new Promise((resolve,reject)=>{
+        this.$http.get('lawss/sarBussionessStand/selectById', {
+          id,type
+        }, {
+          _this: this
+        }, res => {
+          resolve(res)
+        },e => reject(e))
+      })
+    },
+    refreshStandMap(){
+      this.standMap = new Map()
+      this.standList.forEach(item=>{
+        this.standMap.set(item.standardId,item)
+      })
+    },
+    checkedRole(data){
+    if(data[0].id){
+        let asdId = sessionStorage.getItem('queId')
+        this.$http.postData('lawss/AskUser/insertAskUser',{
+            asdId: asdId,
+            usid:  data[0].id,
+        },{
+            _this: this
+        }, res => {
+        }, e => {
+
+        })
+    }
+    },
+    roleFlagBooFunc(boo){
+      if(boo){
+        this.roleFlag = true
+      }
+    },
+    emitInsState(state){
+        if(state){
+            this.questionClick()
+        }else {
+            this.dataLoading = true
+        }
+    },
+    changeInput:debounce(function(val){
+      if(val.length){
+          this.$http.get('lawss/AskQuestions/resemblance',{
+            problemDescription: val,
+          },{
+            _this: this
+          }, res => {
+            this.historyList = res.data
+          })
+      }
+    }),
+    //点击跳转问题详情
+    historyJump(item){
+      this.$router.push({
+        path: "/questionDetail",
+        query: {
+          id: item.id
+        }
+      });
+      // 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) {
+      let routeUrl = this.$router.resolve({
+        name: "OtherStandardDetails",
+        params: {
+          id: item.id || item.standId,
+          pageType: item.standType + '_STAND'
+        }
+      });
+      window.open(routeUrl.href, "_blank");
+    },
+    // 将文本状态的id与name对应
+    setMap(data) {
+      data.forEach(item => {
+        this.$set(this.textStatusMap, item.value, item.label)
+      })
+    },
+    dataSourceChange() {
+      this.handleSelectForm.page = 1
+      this.lawInfoTableLoading = true
+      this.handleSelectForm.standType = this.handleSelectForm.dataSource
+      this.searchLawBtn()
+    },
+    isRelateAccessChange(){
+      this.handleSelectForm.page = 1
+      this.lawInfoTableLoading = true
+      this.handleSelectForm.standType = this.handleSelectForm.dataSource
+      this.searchLawBtn()
+    },
+    //根据标准编号的查询
+    lawNumberSearch() {
+      this.handleSelectForm.standNumber = this.handleSelectForm.lawNumber
+      this.handleSelectForm.lawsNumber = this.handleSelectForm.lawNumber
+      this.handleSelectForm.standCode = this.handleSelectForm.lawNumber
+    },
+    addList() {
+      this.handleSelectForm.lawNumber = ''
+      this.handleSelectForm.dataSource = this.standType
+      this.handleSelectForm.standType = this.standType
+      this.searchLawBtn()
+      this.standModel = true;
+    },
+    //选择标准确定按钮
+    handleSelectConfirm(){
+      if(this.handleSelectTableList.length === 1){
+        if(this.handleSelectForm.dataSource === 'BUSINESS_STAND'){
+            this.questionForm.standardEncdoing = this.handleSelectTableList[0].standCode
+        }else{
+          this.questionForm.standardEncdoing = this.handleSelectTableList[0].standYear ?
+            this.handleSelectTableList[0].standSortShow + '\xa0' + this.handleSelectTableList[0].standNumber + '-' + this.handleSelectTableList[0].standYear :
+            this.handleSelectTableList[0].standSortShow + this.handleSelectTableList[0].standNumber
+        }
+        this.questionForm.standardName = this.handleSelectTableList[0].standName
+        this.questionForm.standSortShow = this.handleSelectTableList[0].standSortShow
+        this.questionForm.standYear = this.handleSelectTableList[0].standYear
+        this.questionForm.standNumber = this.handleSelectTableList[0].standNumber
+        this.questionForm.standardId = this.handleSelectTableList[0].id
+        this.standModel = false
+      }else{
+        this.$message.warning('请选择一条数据进行添加')
+      }
+    },
+    //选择标准的查询按钮
+    searchLawBtn(){
+      this.lawNumberSearch()
+      this.lawInfoTableLoading = true
+      if (this.handleSelectForm.dataSource === 'INLAND'){
+        this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPageByWk1',this.handleSelectForm,{
+          _this: this
+        },res=>{
+          if (res.ok){
+            this.lawInfoTable = res.data.list
+            this.handleSelectForm.total = res.data.count
+            if ((this.lawInfoTable.length === 0 || this.lawInfoTable === []) && this.handleSelectForm.page !== 1) {
+              this.lawInfoTableLoading = true
+              this.handleSelectPageChange(1)
+            }else {
+              this.lawInfoTableLoading = false
+              this.lawInfoTableLoading = false
+            }
+          }else {
+            this.$message.error(res.message)
+          }
+        },e=>{
+          this.lawInfoTable = []
+          this.handleSelectForm.total = 0
+        })
+      }else if(this.handleSelectForm.dataSource === 'FOREIGN'){
+        this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPageByWk1',this.handleSelectForm,{
+          _this: this
+        },res=>{
+          if (res.ok){
+            this.lawInfoTable = res.data.list
+            this.handleSelectForm.total = res.data.count
+            if ((this.lawInfoTable.length === 0 || this.lawInfoTable === []) && this.handleSelectForm.page !== 1) {
+              this.lawInfoTableLoading = true
+              this.handleSelectPageChange(1)
+            }else {
+              this.lawInfoTableLoading = false
+            }
+          }else {
+            this.$message.error(res.message)
+            this.lawInfoTableLoading = false
+          }
+        },e=>{
+          this.lawInfoTable = []
+          this.handleSelectForm.total = 0
+        })
+      }else if(this.handleSelectForm.dataSource === 'BUSINESS_STAND'){
+        this.$http.get('lawss/sarBussionessStand/getSarBussionStandPage',this.handleSelectForm,{
+          _this: this
+        },res=>{
+          if (res.ok){
+            this.lawInfoTable = res.data.list
+            this.handleSelectForm.total = res.data.count
+            if ((this.lawInfoTable.length === 0 || this.lawInfoTable === []) && this.handleSelectForm.page !== 1) {
+              this.lawInfoTableLoading = true
+              this.handleSelectPageChange(1)
+            }else {
+              this.lawInfoTableLoading = false
+            }
+          }else {
+            this.$message.error(res.message)
+            this.lawInfoTableLoading = false
+          }
+        },e=>{
+          this.lawInfoTable = []
+          this.handleSelectForm.total = 0
+        })
+      }else {
+        this.$message.warning('请先选择标准/政策来源')
+      }
+    },
+    //手动查找的清空按钮
+    clearLawBtn(){
+      this.lawInfoTableLoading = true
+      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 = ''
+      this.searchLawBtn()
+    },
+    formatIssueDate(str) {
+      const momentDate = this.$moment(str)
+      if (momentDate.isValid()) {
+        return this.$moment(str).format('YYYY-MM-DD')
+      } else {
+        return str
+      }
+    },
+    //添加标准勾选框数据
+    handleSelectTableChange (data) {
+      this.handleSelectTableList = data
+    },
+    handleSelectPageChange(page){
+      this.lawInfoTableLoading = true
+      this.handleSelectForm.page = page
+      this.searchLawBtn()
+    },
+    handleSelectPageSizeChange(pageSize){
+      this.lawInfoTableLoading = true
+      this.handleSelectForm.pageSize = pageSize
+      this.searchLawBtn()
+    },
+    //单选框type值改变
+    standTypeChange(){
+      this.questionForm.classification = this.standType
+    },
+    handleClick(){
+      this.standList = []
+      switch (this.activeName) {
+        case 'myQue':
+          this.standSearch() // 查询提问标准
+          break
+        case 'myAns':
+          this.ansSearch() //查询回答标准
+          break
+        case 'mySub':
+          this.subSearch()  //查询订阅标准
+          break
+      }
+
+    },
+    sourceClick(){
+      this.standList = []
+      this.questionSerach.classification = this.activeType
+      this.questionSerach.standardEncdoing = ''
+      this.standSearch()
+    },
+    sourceClick2(){
+      this.standList = []
+      this.questionSerach.classification = this.activeType
+      this.ansSearch()
+    },
+    //我的订阅
+    sourceClick3(){
+      this.standList = []
+      this.questionSerach.classification = this.activeType
+      this.subSearch()
+    },
+    standClick(){
+      this.tagsLoading = true
+      this.queSearch()
+    },
+    standClick2(){
+       this.tagsLoading = true
+       this.$http.get('lawss/AskQuestions/getAskQuestionsByStandardId',{
+         standardId: this.activestand,
+         answerer: this.$store.getters.userInfo.userId,
+       },{
+         _this: this
+       }, res => {
+         this.questionsList = res.data
+         this.tagsLoading = false
+       }, e =>{
+
+       })
+    },
+    standClick3(){
+      this.tagsLoading = true
+      this.$http.get('lawss/AskQuestions/getSubscriptionByStandId',{
+        standardId: this.activestand,
+        answerer: this.$store.getters.userInfo.userId,
+      },{
+        _this: this
+      }, res => {
+        this.questionsList = res.data
+        this.tagsLoading = false
+      }, e =>{
+
+      })
+    },
+    questionClick(){
+       this.dataLoading = true
+       sessionStorage.setItem('queId', this.activeQue)
+       this.$http.get('lawss/AskQuestions/getAskQuestionsByakId',{
+         id: this.activeQue
+       },{
+         _this: this
+       }, res => {
+         if(this.activeName === 'myAns'){
+            if(res.data.length){
+
+              res.data.forEach(item => {
+                item.checkedShow = true
+                if(item.state && item.state === 'yes'){
+                  item.checked = true
+                }else {
+                  item.checked = false
+                }
+              })
+            }
+           this.answerList = res.data
+           this.answerList.fileList = this.assemble(this.answerList.appendixId,this.answerList.appendixName)
+         }else{
+           this.answerList = res.data
+           this.answerList.fileList = this.assemble(this.answerList.appendixId,this.answerList.appendixName)
+         }
+         this.qiiKey++
+         this.dataLoading = false
+         this.tagsLoading = false
+       }, e => {
+       })
+    },
+    fileListSetFunc(item){
+      return this.assemble(item.appendixId,item.appendixName)
+    },
+    assemble(ids,names){
+      let list= [];
+      if(ids && ids !== '' && names && names !== ''){
+        let idArray=ids.split(',');
+        let nameArray=names.split(',');
+        for(let i=0; i<idArray.length; i++){
+          list.push({id:idArray[i],name:nameArray[i]});
+        }
+      }
+      return list;
+    },
+    //提问按钮
+    queBtn(){
+      this.fileList = []
+      // 清空提问
+      if(this.standList.length === 0){
+        this.standType = !this.activeType ? 'INLAND' : this.activeType
+        this.questionForm = {
+          pubQue :  '',//公共问题
+          classification: !this.activeType ? 'INLAND' : this.activeType, //标准类型
+          problemDescription: '', //问题
+          questioner: this.$store.getters.userInfo.userId, //提问人
+          standardEncdoing: '',  //标准编号
+          standardName: '',   //标准名称
+          standardId:'',   //标准id
+          fileList: '',
+        }
+      }else{
+        const selectedStand = this.activestand == '0' || this.activeType === 'INLAND' ? this.standList[0] : this.standMap.get(this.activestand)
+        this.standType = selectedStand.classification
+        this.questionForm = {
+          pubQue :  selectedStand.classification === "OTHER" ? selectedStand.standardId : '',//公共问题
+          classification: selectedStand.classification, //标准类型
+          problemDescription: '', //问题
+          questioner: this.$store.getters.userInfo.userId, //提问人
+          standardEncdoing: selectedStand.standardEncdoing,  //标准编号
+          standardName: selectedStand.standardName,   //标准名称
+          standardId: selectedStand.standardId,   //标准id
+          fileList: '',
+        }
+      }
+      this.dialogVisible = true
+    },
+    handleClose(){
+       this.dialogVisible = false
+    },
+    //清空
+    delSearch(){
+      this.questionSerach = {
+          classification: 'INLAND',
+          type: '',
+          standardName: '',  //标准名称
+          standardEncdoing: '', //标准编号
+          questioner: this.$store.getters.userInfo.userId,   //提问人
+          subscription: this.$store.getters.userInfo.userId,   //订阅人
+          answerer: this.$store.getters.userInfo.userId,   //回答人
+          problemDescription: '',  //关键词/问题描述
+      }
+    },
+    searchBtn(){
+      this.questionSerach.classification = this.activeType
+      switch (this.activeName) {
+        case 'myQue':
+          this.questionSerach.type = 'myQue'
+          this.questionSerach.subscription = ''
+          this.questionSerach.answerer = ''
+          break
+        case 'myAns':
+          this.questionSerach.type = 'myAns'
+          this.questionSerach.subscription = ''
+          this.questionSerach.questioner = ''
+          break
+        case 'mySub':
+          this.questionSerach.type = 'mySub'
+          this.questionSerach.questioner = ''
+          this.questionSerach.answerer = ''
+          break
+      }
+      this.$http.get('lawss/AskQuestions/retrieve',{
+         ...this.questionSerach
+      },{
+        _this: this
+      }, res => {
+        this.standList = res.data
+        this.refreshStandMap()
+      })
+    },
+    //问题查询
+    queSearch(){
+       this.$http.get('lawss/AskQuestions/getAskQuestionsByStandardId',{
+         standardId: this.activestand,
+         answerer: this.$store.getters.userInfo.userId,
+       },{
+         _this: this
+       }, res => {
+         this.questionsList = res.data
+         this.tagsLoading = false
+       })
+    },
+    //查询回答标准
+    ansSearch(){
+      this.$http.get('lawss/AskQuestions/getReplyDetails',{
+        classification: this.activeType,
+        answerer: this.$store.getters.userInfo.userId,
+      }, {
+        _this: this,
+      }, res => {
+        this.standList = res.data
+        this.refreshStandMap()
+        this.questionClick()
+      })
+    },
+    //查询订阅标准
+    subSearch(){
+       this.$http.get('lawss/AskQuestions/getAskQuestionsBySubscription',{
+         classification: this.activeType,
+         answerer: this.$store.getters.userInfo.userId,
+       },{
+         _this: this
+       }, res => {
+         this.standList = res.data
+         this.refreshStandMap()
+         this.questionClick()
+       }, e =>{
+
+       })
+    },
+    //查询提问标准
+    standSearch(){
+      if(this.$route.query){
+        this.questionSerach.standardEncdoing = this.prcName
+      }
+      console.log(this.questionSerach)
+      this.$http.get('lawss/AskQuestions/getAskQuestionsDetails',{ ...this.questionSerach },{
+        _this: this
+      }, res =>{
+        this.standList = res.data
+        this.refreshStandMap()
+        this.questionClick()
+      }, e => {
+
+      })
+    },
+    //文件上传前
+    beforeUploadTheme(file){
+      var filename = file.name;
+      var index1 = filename.lastIndexOf('.')
+      var index2 = filename.length
+      var fileSuffix = filename.substring(index1, index2)
+      //把后缀转大写
+      if(fileSuffix){
+        fileSuffix = fileSuffix.toUpperCase()
+      }
+      // 判断上传文件格式
+      if (fileSuffix === ".PDF" || fileSuffix === ".DOC" || fileSuffix === ".DOCX" || fileSuffix === ".PPT"
+        || fileSuffix === ".PPTX" || fileSuffix === ".XLS" || fileSuffix === ".XLSX"
+        || fileSuffix === ".PNG" || fileSuffix === ".JPG" || fileSuffix === ".JPEG") {
+        return true;
+      } else {
+        this.$message.error("文件" + file.name + "格式不正确，请上传pdf、doc、docx、ppt、pptx、xls、xlsx、png、jpg、jpeg等文件");
+        return false;
+      }
+      // 判断文件上传大小
+      if (file.size / 1024 / 1024 > 300) {
+        this.$message.warning("文件" + file.name + "大小不能超过300M");
+        return false;
+      }
+      return true;
+    },
+    //删除文件前
+    beforeRemoveTheme(){
+       this.fileList.forEach((item,index) => {
+         if(item.name === file.name || item.id === file.id){
+           this.fileList.splice(index, 1)
+         }
+       })
+      // let list = ''
+      // this.fileInfoList.forEach(item => {
+      //   if (list.length > 0) {
+      //     list += ','
+      //     list += item.name
+      //   } else {
+      //     list+= item.name
+      //   }
+      // })
+      // this.questionForm.fileInfo = list
+    },
+    //文件上传成功
+    onsuccessTheme(res,file,fileList){
+      if(res.ok){
+        this.fileList.push(res.data)
+        this.$message.success('上传成功')
+      }else{
+        this.$message.warning(res.message)
+        fileList.pop()
+      }
+      // let list = ''
+      // this.fileInfoList.forEach(item => {
+      //   if (list.length > 0) {
+      //     list += ','
+      //     list += item.name
+      //   } else {
+      //     list+= item.name
+      //   }
+      // })
+      // this.questionForm.fileInfo = list
+    },
+    //提交问题
+    queSubmit(){
+      if(this.standType === 'OTHER'){
+        this.questionForm.standardId = this.questionForm.pubQue
+        this.questionForm.standardName = this.questionForm.pubQue
+        this.questionForm.standardEncdoing = this.questionForm.pubQue
+      }
+      if(!this.questionForm.standardId){
+          this.$message.warning('请选择至少一条标准')
+          return
+      }
+      this.questionForm.fileList = this.fileList
+      this.$refs['queForm'].validate((valid) => {
+            if(valid){
+              this.submitBtnLoading = true
+                this.$http.postData('lawss/AskQuestions/insertAskQuestions',{ ...this.questionForm },
+                    {
+                        _this: this
+                    }, res => {
+                        this.submitBtnLoading = false
+                        this.dialogVisible = false
+                        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 = ''
+                        this.$http.post('lawss/activiti/startProcessRollBack',{
+                            json: JSON.stringify(res.data),
+                            type: '27',
+                                  createUser: this.$store.getters.userInfo.userId,
+                                  createUserName: this.$store.getters.userInfo.userName,
+                                },
+                          {
+                            _this: this
+                          }, val => {
+                                  this.$http.post('lawss/activiti/completeTask',{
+                                            taskIds: val.data,
+                                            userId : this.$store.getters.userInfo.userId,
+                                            json: JSON.stringify(res.data),
+                                          },
+                                          {
+                                            _this: this
+                                          }, res => {
+                                          }, e => {
+                                          })
+                          }, e => {
+                          })
+                    }, e => {
+                        this.submitBtnLoading = false
+                    })
+            }else{
+                return this.$message.warning('请输入问题')
+            }
+        })
+    },
+  },
+};
+</script>
+
+<style lang="less" scoped>
+/deep/ .contentClass{
+  height: calc(~ '100% - 40px') !important;
+  overflow: auto !important;
+}
+#my-questions{
+  height: calc(100vh - 75px);
+  display: flex;
+  flex-direction: column;
+  background: #F5F7FA;
+  margin-bottom: 10px;
+  .tab-box{
+    height: 93%;
+  }
+  .type-tabs {
+    /deep/.el-tabs__header {
+      margin-right: 0;
+    }
+    /deep/.el-tabs__content {
+      overflow-y: auto;
+      padding: 0;
+      .el-tab-pane {
+        height: 100%;
+      }
+    }
+  }
+  .question-box{
+
+  }
+  .question-tabs {
+    height: 100%;
+    border-top: none;
+    border-bottom: none;
+    /deep/.el-tabs__nav {
+      height: 100%;
+      overflow: auto;
+    }
+    /deep/ &.el-tabs--border-card .el-tabs__item{
+      height: 65px;
+      border-color: #d1dbe5 transparent;
+      text-align: left !important;
+      border-top-color: transparent;
+      &.is-active {
+        border-top-color: #d1dbe5;
+      }
+    }
+  }
+  /deep/.el-tabs__content{
+    height: 100%;
+    padding: 0;
+  }
+  /deep/.el-tab-pane{
+    height: 100%;
+  }
+  .com-box{
+    /deep/.el-tabs__item .is-left{
+      height: auto;
+    }
+  }
+}
+/deep/.el-tabs--left .el-tabs__item.is-left {
+  text-align: left;
+  height: auto;
+}
+.ansBox{
+  height: calc(~ '100% - 190px');
+  overflow: auto;
+}
+.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) */
+}
+.info-answer{
+  height: 200px;
+  width: 100%;
+  position: absolute;
+  bottom: 0;
+  //border-top: 1px solid #cccccc;
+}
+/deep/.el-upload-dragger{
+  width: 495px !important;
+}
+.el-input{
+  width: 90%;
+}
+/deep/.el-dialog__body{
+  padding: 10px;
+}
+ /deep/.el-upload-dragger {
+  height: 90px;
+}
+ .history-item{
+   padding: 15px;
+   line-height: 1.5;
+   font-size: 14px;
+   color: #409EFF;
+   cursor: pointer;
+ }
+</style>
diff --git a/src/pages/processCenter/pages/components/ProcessFooter.vue b/src/pages/processCenter/pages/components/ProcessFooter.vue
index d00e6488e..3af8662b4 100644
--- a/src/pages/processCenter/pages/components/ProcessFooter.vue
+++ b/src/pages/processCenter/pages/components/ProcessFooter.vue
@@ -104,7 +104,7 @@
         icon="el-icon-check"
         @click="handleReceive"
         :loading="submitLoading"
-      v-if="showReceive"
+      v-if="false"
       >接收任务</el-button>
       <el-button
               type="danger"
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditListFb.vue b/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditListFb.vue
index 33c7a694a..0a8fed67a 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditListFb.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditListFb.vue
@@ -7,7 +7,7 @@
     <el-row :gutter="24">
       <el-col :span="12">
         <el-form-item label="企标类别" prop="standSort" class="add-form-item form-item-disabled">
-          <el-select v-model="form.standSort" filterable clearable>
+          <el-select v-model="form.standSort" filterable clearable @change="standSortChange">
             <el-option
                     v-for="item in standSortOptions"
                     placeholder="请选择企标类别"
@@ -18,12 +18,20 @@
           </el-select>
         </el-form-item>
         <el-form-item label="制修订类型" prop="reviseStatus" class="add-form-item form-item-disabled" >
-          <template>
-            <div style="padding-left: 10px; color: #666666;"  v-if="form.reviseStatus === '1'">制定</div>
-            <div style="padding-left: 10px; color: #666666;"  v-else-if="form.reviseStatus === '2'">修订</div>
-            <div style="padding-left: 10px; color: #666666;"  v-else-if="form.reviseStatus === '3'">修改</div>
-            <div style="padding-left: 10px; color: #666666;"  v-else></div>
-          </template>
+          <el-select v-model="form.reviseStatus" filterable>
+            <el-option
+                v-for="item in opinionsStand"
+                :key="item.value"
+                :value="item.value"
+                :label="item.label"
+            ></el-option>
+          </el-select>
+          <!--<template>-->
+          <!--  <div style="padding-left: 10px; color: #666666;"  v-if="form.reviseStatus === '1'">制定</div>-->
+          <!--  <div style="padding-left: 10px; color: #666666;"  v-else-if="form.reviseStatus === '2'">修订</div>-->
+          <!--  <div style="padding-left: 10px; color: #666666;"  v-else-if="form.reviseStatus === '3'">修改</div>-->
+          <!--  <div style="padding-left: 10px; color: #666666;"  v-else></div>-->
+          <!--</template>-->
         </el-form-item>
         <el-form-item label="中文名称" prop="standName" class="add-form-item form-item-disabled">
           <el-input
@@ -80,7 +88,8 @@
                   clearable
           ></el-input>
         </el-form-item>
-        <el-form-item v-show="form.reviseStatus === '1'" label="企标顺序号" :prop="form.reviseStatus === '1'?standNum : ''" class="add-form-item form-item-disabled">
+        <!--<el-form-item v-show="form.reviseStatus === '1'" label="企标顺序号" :prop="form.reviseStatus === '1'?standNum : ''" class="add-form-item form-item-disabled">-->
+        <el-form-item v-show="form.reviseStatus === '1' || form.reviseStatus === '2'" label="企标顺序号" :prop="form.reviseStatus === '1'?standNum : ''" class="add-form-item form-item-disabled">
             <el-input
                     v-model="form.standNum"
                     :maxLength="100"
@@ -439,7 +448,7 @@
                   disabled
           ></el-input>
         </el-form-item>
-        <el-form-item label="采标程度" prop="CYCD" class="add-form-item form-item-disabled">
+        <el-form-item label="采标程度" prop="CYCD" class="add-form-item form-item-disabled cbcd">
           <el-select v-model="form.CYCD" filterable clearable
                      placeholder="请先选择采标程度"
           >
@@ -753,6 +762,11 @@ export default {
   },
   data () {
     return {
+      opinionsStand:[
+        {value: '1',label: '制定'},
+        {value: '2',label: '修订'},
+        {value: '3',label: '修改'},
+      ],
       fileId:'',
       dialogVisible: false,
       config: {
@@ -827,6 +841,9 @@ export default {
     ...mapGetters(['userInfo'])
   },
   methods: {
+    standSortChange(val){
+      this.$emit('standSortChange',val)
+    },
     filterOp(data){
       if(!data){
         return  ""
@@ -1097,6 +1114,11 @@ export default {
         }
       }
     },
+    'form.reviseStatus':{
+      handler(val) {
+        this.$emit('reveseStatusChange',val)
+      }
+    }
   }
 }
 </script>
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue
index 2ec22b855..c8bb9102e 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue
@@ -45,6 +45,8 @@
                         @formChoiceZRR3 = "formChoiceZRR3"
                         @formChoiceZRR4 = "formChoiceZRR4"
                         @formChoiceZRR5 = "formChoiceZRR5"
+                        @standSortChange = "standSortChange"
+                        @reveseStatusChange = 'reveseStatusChange'
                 />
                 <div>
                     <el-collapse accordion v-model="activeName">
@@ -1118,6 +1120,7 @@
                 syrzOptions:[],//适用认证下拉框
                 data: [], // 标准列表数据
                 ListForm: {}, // 新增数据
+                maxStandnSn:"", // 最大順序號
             }
         },
         watch:{
@@ -1166,6 +1169,16 @@
             },
         },
         methods: {
+            reveseStatusChange(val){
+              if(val === '1'){
+                this.form.standNum = this.maxStandnSn
+              }else{
+                this.form.standNum = this.form.standSn
+              }
+            },
+            standSortChange(val){
+              this.form.standCode = val + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
+            },
             checkedRoleTransfer (data) {
                 this.isSubmit = true
                 this.saveLoading = true
@@ -1266,6 +1279,7 @@
                     this.fileType = fileType
                     this.fileUpload(fileType)
                 }
+              this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
             },
             modelProp(row,index){
                 console.log(row)
@@ -2853,6 +2867,13 @@
                 }, e => {
                 })
             },
+          getMaxStandnSn(){
+            this.$http.get('lawss/sarBussionessStand/selectMaxStandnSn', '', {
+              _this: this
+            }, res => {
+              this.maxStandnSn = res.data
+            })
+          }
         },
         mounted () {
             // this.getTaskId()
@@ -2894,6 +2915,7 @@
             }
             this.busVsFunc()
             this.modelFunc()
+            this.getMaxStandnSn();
         }
 
     }
@@ -2904,6 +2926,9 @@
     /deep/ .el-input__suffix{
         display: none !important;
     }
+    /deep/ .cbcd .el-input__suffix{
+        display: inline-block !important;
+    }
     /deep/ #active2 .el-form-item__content{
         margin-left: 0px !important;
     }
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step6.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step6.vue
index 3f2eb9160..d26afae77 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step6.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step6.vue
@@ -149,6 +149,7 @@
             <div style="flex: auto;" v-show="active === '2'">
                 <formEditList
                         :key = "formKey"
+                        :isTrue="true"
                         :formSub = "form"
                         :FBGBUSSFileListSub = "FBGBUSSFileList"
                         :LSBBBUSSFileListSub = "LSBBBUSSFileList"
diff --git a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
index 5033e3cf7..5813929e4 100644
--- a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
+++ b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
@@ -929,7 +929,7 @@
           accept=".ZIP, .zip"
           :before-upload="beginImportFile"
           :on-success="importFileSuccess"
-          :show-file-list="false"
+          :show-file-list="true"
         >
           <div style="padding: 20px 0">
             <i class="el-icon-upload" style="color: #3399ff"></i>
@@ -4471,6 +4471,11 @@ export default {
     },
     // 点击导入标准
     addImportModal(flag) {
+      if(this.selectSarMenu.id === undefined){
+        this.importFailed = true;
+        this.importForm.content = '请选择需要导入的目录'
+        return
+      }
       this.importModalshowflag = true
       this.showUploadlist = true
       this.importExcelUrl = '/api/lawss/sarBussionessStand/importSarBussionessStandFile?menuId=' + this.selectSarMenu.id + '&userId=' + this.$store.getters.userInfo.userId
diff --git a/src/pages/regulatoryRepository/standQA/index.vue b/src/pages/regulatoryRepository/standQA/index.vue
index ccf4c45b0..b79eeb03c 100644
--- a/src/pages/regulatoryRepository/standQA/index.vue
+++ b/src/pages/regulatoryRepository/standQA/index.vue
@@ -1073,6 +1073,27 @@ export default {
                   this.dialogVisible = false
                     this.isSubmit = false
                   this.searchBtn()
+                  this.$http.post('lawss/activiti/startProcessRollBack',{
+                      json: JSON.stringify(res.data),
+                      type: '27',
+                      createUser: this.$store.getters.userInfo.userId,
+                      createUserName: this.$store.getters.userInfo.userName,
+                    },
+                    {
+                      _this: this
+                    }, val => {
+                      this.$http.post('lawss/activiti/completeTask',{
+                          taskIds: val.data,
+                          userId : this.$store.getters.userInfo.userId,
+                          json: JSON.stringify(res.data),
+                        },
+                        {
+                          _this: this
+                        }, res => {
+                        }, e => {
+                        })
+                    }, e => {
+                    })
                 }, e => {
 
                 })
diff --git a/src/pages/searchCenter/pages/standardSearch.vue b/src/pages/searchCenter/pages/standardSearch.vue
index 95c032033..f093e2848 100644
--- a/src/pages/searchCenter/pages/standardSearch.vue
+++ b/src/pages/searchCenter/pages/standardSearch.vue
@@ -30,7 +30,7 @@
                             <div>首页</div>
                         </router-link>
 <!--                        <button>标准翻译申请流程</button>-->
-                        <a  class="router-link1" style="margin-left: 10px;">
+                        <a v-if="false"  class="router-link1" style="margin-left: 10px;">
                             标准需求（翻译）申请流程
                         </a>
                     </div>
diff --git a/src/router/index.js b/src/router/index.js
index fa6658dbd..7299ca608 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -338,6 +338,15 @@ const routes = [
           requireAuth: false,
           title: '我的问答'
         }
+      },
+        {
+        path: '/questions3',
+        name: 'MyQuestions3',
+        component: resolve => require(['@/pages/personal/pages/my-questions/index3.vue'], resolve),
+        meta: {
+          requireAuth: false,
+          title: '我的问答'
+        }
       },
       {
         path: '/questionDetail',