From 10752da4b4156032b6973aeef5f66a11258f22ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Wed, 1 Jun 2022 13:17:59 +0800
Subject: [PATCH 01/13] =?UTF-8?q?=E6=89=8B=E6=9C=BA=E7=AB=AF=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/questionItemInfo.vue           |  33 +++
 .../components/questions-item.vue             |  51 ++---
 .../my-questions/components/stand-item.vue    |  54 +++++
 .../personal/pages/my-questions/index.vue     | 193 +++++++++++------
 src/pages/phone/databaseSearch.vue            | 101 +++++++--
 src/pages/phone/domesticStand.vue             | 195 +++++++++++++++++-
 6 files changed, 514 insertions(+), 113 deletions(-)
 create mode 100644 src/pages/personal/pages/my-questions/components/questionItemInfo.vue
 create mode 100644 src/pages/personal/pages/my-questions/components/stand-item.vue

diff --git a/src/pages/personal/pages/my-questions/components/questionItemInfo.vue b/src/pages/personal/pages/my-questions/components/questionItemInfo.vue
new file mode 100644
index 000000000..9970b18d9
--- /dev/null
+++ b/src/pages/personal/pages/my-questions/components/questionItemInfo.vue
@@ -0,0 +1,33 @@
+<!--回答框-->
+<template>
+  <div id="answer-item">
+    <div>
+      <div class="row">
+        <div class="item">
+          <div>回答：
+            <span>{{question.question}}</span>
+          </div>
+        </div>
+      </div>
+      <div class="row">
+        <div class="item">
+          <div>{{question.person}}
+            <span>{{question.modifyTime}}</span>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "questionItemInfo"
+};
+</script>
+
+<style lang="less" scoped>
+#answer-item{
+
+}
+</style>
diff --git a/src/pages/personal/pages/my-questions/components/questions-item.vue b/src/pages/personal/pages/my-questions/components/questions-item.vue
index cbff2eb72..8eafd607a 100644
--- a/src/pages/personal/pages/my-questions/components/questions-item.vue
+++ b/src/pages/personal/pages/my-questions/components/questions-item.vue
@@ -1,24 +1,22 @@
-<!--问题项的描述-->
+<!--问题的描述-->
 <template>
 <div id="questions-item">
-   <div>
-     <div class="row">
-       <div class="item">
-         <span>{{question.modifyTime}}</span>
-       </div>
-       <div class="item"  style="padding-left: 10px;">
-         <span>{{ resType }}</span>
-       </div>
-     </div>
-     <div class="row" style="margin-top: 10px">
-        <div class="item">
-          <span>{{question.resCode}}</span>
+  <div>
+    <div class="row">
+      <div class="item">
+        <div>提问：
+         <span>{{question.question}}</span>
         </div>
-       <div class="item" style="padding-left: 10px">
-         <span>{{question.content}}</span>
-       </div>
-     </div>
-   </div>
+      </div>
+    </div>
+    <div class="row">
+      <div class="item">
+        <div>{{question.person}}
+          <span>{{question.modifyTime}}</span>
+        </div>
+      </div>
+    </div>
+  </div>
 </div>
 </template>
 
@@ -27,15 +25,6 @@ export default {
   name: "questions-item",
   props: ['question'],
   computed: {
-    resType() {
-      const matcher = {
-        INLAND_STAND: '国内标准',
-        FOREIGN_STAND: '国外标准',
-        FOREIGN_LAWS: '国内外政策',
-        BUSINESS: '企业标准'
-      }
-      return matcher[this.question.resType]
-    }
   },
   data(){
     return{
@@ -45,8 +34,8 @@ export default {
     question: {
       immediate: true,
       deep: true,
-      handler(val) {
-        this.question = val
+      handler(val){
+        console.log(val);
       }
     }
   }
@@ -56,10 +45,10 @@ export default {
 <style lang="less" scoped>
 #questions-item{
   width: 100%;
+  min-width: 130px;
   padding:10px 0;
-
   .row {
-    line-height: 1.2;
+    line-height: 1.8;
   }
   .item {
     display: inline-block;
diff --git a/src/pages/personal/pages/my-questions/components/stand-item.vue b/src/pages/personal/pages/my-questions/components/stand-item.vue
new file mode 100644
index 000000000..65eedfc51
--- /dev/null
+++ b/src/pages/personal/pages/my-questions/components/stand-item.vue
@@ -0,0 +1,54 @@
+<!--标准的描述-->
+<template>
+  <div id="stand-item">
+    <div>
+      <div class="row">
+        <div class="item">
+          <span>{{stand.resCode}}</span>
+        </div>
+      </div>
+      <div class="row">
+        <div class="item">
+          <span>{{stand.resName}}</span>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "stand-item",
+  props: ['stand'],
+  computed: {
+  },
+  data(){
+    return{
+    }
+  },
+  watch:{
+    stand: {
+      immediate: true,
+      deep: true,
+      handler(val) {
+        console.log(val);
+        this.stand = val
+      }
+    }
+  }
+};
+</script>
+
+<style lang="less" scoped>
+#stand-item{
+  width: 100%;
+  min-width: 130px;
+  padding:10px 0;
+  .row {
+    line-height: 1.5;
+  }
+  .item {
+    display: inline-block;
+  }
+}
+</style>
diff --git a/src/pages/personal/pages/my-questions/index.vue b/src/pages/personal/pages/my-questions/index.vue
index a17b81c72..698a2d7b0 100644
--- a/src/pages/personal/pages/my-questions/index.vue
+++ b/src/pages/personal/pages/my-questions/index.vue
@@ -23,63 +23,108 @@
        </el-form-item>
      </el-form>
    </div>
-  <el-tabs
-    type="border-card"
-    style="height: 100%"
-    class="type-tabs"
-    tab-position="left"
-  >
-    <el-tab-pane label="我的提问">
-     <div style="height: 100%">
-       <el-tabs
-         class="question-tabs"
-         type="border-card"
-         style="height: 100%"
-         tab-position="left">
-         <el-tab-pane label="国内标准">
-                  <el-tabs
-                    class="question-tabs"
-                    type="border-card"
-                    style="height: 100%"
-                    tab-position="left"
-                  >
-                    <template v-for="question in questionList">
-                      <el-tab-pane class="com-box" :name="question.name">
-                        <template slot="label">
-                          <questonsItem :question="question"></questonsItem>
-                        </template>
-                      </el-tab-pane>
-                    </template>
-                  </el-tabs>
-         </el-tab-pane>
-         <el-tab-pane label="海外标准">
-         </el-tab-pane>
-         <el-tab-pane label="企业标准">
-         </el-tab-pane>
-         <el-tab-pane label="公共问题">
-         </el-tab-pane>
-       </el-tabs>
-     </div>
-    </el-tab-pane>
-    <el-tab-pane label="我的回答">
-      <div>
+  <div class="tab-box">
+    <el-tabs
+      type="border-card"
+      style="height: 100%"
+      class="type-tabs"
+      tab-position="left"
+    >
+      <el-tab-pane label="我的提问">
+        <div style="height: 100%">
+          <el-tabs
+            class="question-tabs"
+            type="border-card"
+            style="height: 100%"
+            tab-position="left">
+            <el-tab-pane label="国内标准">
+              <div v-if="!standList || standList.length === 0">
+                <div style="padding: 20px;">
+                  暂无数据
+                </div>
+              </div>
+              <div style="height: 100%" v-else>
+                <el-tabs
+                  class="question-box"
+                  type="border-card"
+                  style="height: 100%"
+                  tab-position="left"
+                >
+                  <template v-for="stand in standList">
+                    <el-tab-pane class="com-box" :name="stand.name">
+                      <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
+                          class="question-box"
+                          type="border-card"
+                          style="height: 100%"
+                          tab-position="left"
+                        >
+                          <template v-for="question in questionsList">
+                            <el-tab-pane class="com-box" :name="question.name">
+                              <template slot="label">
+                                <questions-item :question="question"></questions-item>
+                              </template>
+                              <div class="answer-box" >
+                                <template v-for="(item, index) in questionInfo.qaMsgEOListReverse">
+                                  <div class="clearfix">
+                                    <div class="item" >
+                                      <question-item-info ></question-item-info>
+                                    </div>
+                                  </div>
+
+                                </template>
+                              </div>
+                            </el-tab-pane>
+                          </template>
+                        </el-tabs>
+                      </div>
+                    </el-tab-pane>
+                  </template>
+                </el-tabs>
+              </div>
+            </el-tab-pane>
+            <el-tab-pane label="海外标准">
+            </el-tab-pane>
+            <el-tab-pane label="企业标准">
+            </el-tab-pane>
+            <el-tab-pane label="公共问题">
+            </el-tab-pane>
+          </el-tabs>
+        </div>
+      </el-tab-pane>
+      <el-tab-pane label="我的回答">
+        <div>
+
+        </div>
+      </el-tab-pane>
+      <el-tab-pane label="我的订阅">
+        <div>
+        </div>
+      </el-tab-pane>
+    </el-tabs>
+  </div>
 
-      </div>
-    </el-tab-pane>
-    <el-tab-pane label="我的订阅">
-      <div>
-      </div>
-    </el-tab-pane>
-  </el-tabs>
 </div>
 </template>
 
 <script>
-import questonsItem from './components/questions-item'
+import questionsItem from './components/questions-item'
+import questionItemInfo from "@/pages/personal/pages/my-questions/components/questionItemInfo";
+import standItem from './components/stand-item'
 export default {
   name: "index",
   components:{
-    questonsItem,
+    questionItemInfo,
+    questionsItem,
+    standItem
   },
   data(){
     return{
@@ -88,20 +133,27 @@ export default {
         standName: '',
         keyCode: '',
       },
-      questionList: [{
-        title: '问题1',
+      standList: [
+        {
         name: '1',
-        content: '问题1的内容',
         resCode:'GB 17354-XXXX',
-        resType: 'FOREIGN_STAND',
+        resName: '机动车安全运行条件',
+      }, {
+        name: '2',
+        resName: '汽车前后端防护装置',
+        resCode:'GB 14444-1',
+      }],
+      questionsList: [
+        {
+        name: '1',
+        question: '标准何时生效？',
+        person: this.$store.getters.userInfo.userName,
         modifyTime: '2022-03-14 14:40:42',
       }, {
-        title: '问题2',
         name: '2',
-        content: '问题2的内容',
-        resCode:'GB 14444-1',
-        resType: 'INLAND_STAND',
-        modifyTime: '2021-08-35 17:45:49',
+        person: this.$store.getters.userInfo.userName,
+        question: '第四条范围何时更改？',
+        modifyTime: '2022-03-14 14:40:42',
       }],
     }
   },
@@ -111,8 +163,13 @@ export default {
 <style lang="less" scoped>
 #my-questions{
   height: 100%;
+  display: flex;
+  flex-direction: column;
   background: #F5F7FA;
   margin-bottom: 10px;
+  .tab-box{
+    height: 100%;
+  }
   .type-tabs {
     /deep/.el-tabs__header {
       margin-right: 0;
@@ -123,6 +180,9 @@ export default {
         height: 100%;
       }
     }
+  }
+  .question-box{
+
   }
   .question-tabs {
     height: 100%;
@@ -132,10 +192,10 @@ export default {
       height: calc(~'100% - 50px');
       overflow: auto;
     }
-    /deep/ &.el-tabs--border-card .el-tabs__item {
+    /deep/ &.el-tabs--border-card .el-tabs__item{
       height: 65px;
       border-color: #d1dbe5 transparent;
-      text-align: left;
+      text-align: left !important;
       border-top-color: transparent;
       &.is-active {
         border-top-color: #d1dbe5;
@@ -155,4 +215,17 @@ export default {
     }
   }
 }
+/deep/.el-tabs--left .el-tabs__item.is-left {
+  text-align: left;
+  height: auto;
+}
+.answer-box{
+  height: auto;
+  min-height: 200px;
+  width: 100%;
+  min-width: 300px;
+  background: #F5F7FA;
+  float: right;
+  margin: 20px 10px 0 80px;
+}
 </style>
diff --git a/src/pages/phone/databaseSearch.vue b/src/pages/phone/databaseSearch.vue
index 71bb66fae..3db81c197 100644
--- a/src/pages/phone/databaseSearch.vue
+++ b/src/pages/phone/databaseSearch.vue
@@ -23,7 +23,9 @@
     </div>
     <div v-else-if="!loading && standList.length" class="card-content" v-for="item in standList" :key="item.id" @click="jumpDetails(item) ">
       <div class="standTitle">
-        <div class="title">{{item.title}}</div>
+        <div class="title">
+          <span v-html="item.title"></span>
+         </div>
       </div>
       <div class="standContent">
         <div class="standState">标准类别:
@@ -38,6 +40,12 @@
       <van-empty description="暂无数据" />
     </div>
   </div>
+  <div v-if="moreFlag" class="bottom-box">
+    <div v-if="listFlag && !loading" class="list-box">没有更多数据了...</div>
+    <div v-else-if="!listFlag && moreFlag"  @click="moreList" >点击加载更多</div>
+<!--    <van-button v-else-if="!listFlag && moreFlag"  @click="moreList" >加载新数据</van-button>-->
+    <van-loading v-else size="24px" color="#3170A8">加载中...</van-loading>
+  </div>
  </div>
 </template>
 
@@ -48,28 +56,48 @@ export default {
     return{
       scrolled: '',
       moreFlag: false,
+      loadingFlag: false,
       searchKey: '',
       standList: [],
       loading: true,
+      listFlag: false,
       page: 1,
+      addFlag: 0,
     }
   },
+  watch:{
+    scrolled:{
+      handler(val){
+        if(val === 0){
+          console.log('滚动条消失');
+        }
+      }
+    },
+  },
   methods: {
     scrool(){
-      let scrolled = this.$refs.cardBox.scrollTop
+      this.scrolled = this.$refs.cardBox.scrollTop
+      // console.log(this.scrolled);
       //获得可视区的高度
       const windowHeight = this.$refs.cardBox.clientHeight
       //获取滚动条的总高度
       const scrollHeight = this.$refs.cardBox.scrollHeight
-      let windowScrolled  = scrolled + windowHeight
-      this.scrolled = scrolled
-      if(scrollHeight - windowScrolled < 600 ){
-        //把距离顶部的距离加上可视区域的高度 等于或者大于滚动条的总高度就是到达底部
+      let windowScrolled  = this.scrolled + windowHeight
+      if(scrollHeight - windowScrolled < 100 && this.scrolled !== 0){
+        //把距离顶部的距离加上可视区域的高度
         this.moreFlag = true
-        this.page++
+      }else{
+        this.moreFlag = false
       }
     },
-    onSearch(){
+    moreList(){
+      this.moreFlag = false
+      this.loadingFlag = true
+      this.page++
+      this.standSearch()
+    },
+    standSearch(){
+      this.listFlag = false
       this.moreFlag = false
       this.$http.post('search/searchCenter/searchSarBykey',{
         selectIndex: 'fulltextserch',
@@ -80,12 +108,36 @@ export default {
       },{
         _this: this,
       }, res => {
-        if(this.standList.length){
-          this.standList =  this.standList.concat(res.data.list)
+        if(res.data.list.length){
+          if(this.standList.length){
+            this.standList =  this.standList.concat(res.data.list)
+          }else{
+            this.standList = res.data.list
+          }
+          this.loading = false
         }else{
-          this.standList = res.data.list
+          this.listFlag = true
         }
-        console.log(this.standList);
+      }, e => {
+        console.log(e)
+      })
+    },
+    //点击搜索触发事件
+    onSearch(){
+      this.moreFlag = false
+      this.loading = true
+      this.standList = []
+      this.page = 1
+      this.$http.post('search/searchCenter/searchSarBykey',{
+        selectIndex: 'fulltextserch',
+        selectValue: this.searchKey,
+        selectType: 'titleSearch',
+        page: this.page,
+        pageSize: 20
+      },{
+        _this: this,
+      }, res => {
+        this.standList = res.data.list
         this.loading = false
       }, e => {
           console.log(e)
@@ -107,7 +159,7 @@ export default {
   },
   mounted(){
     this.searchKey = this.$route.query.searchKey
-    this.onSearch()
+    this.standSearch()
     this.$refs.cardBox.addEventListener('scroll', this.scrool);
   },
 };
@@ -205,5 +257,28 @@ export default {
     top: 40%;
     left: 37%;
   }
+  .bottom-box{
+    height: 40px;
+    width: 91%;
+    position: absolute;
+    bottom: 0;
+    text-align: center;
+    color: #3170A8;
+    .list-box{
+      color: #3170A8;
+      text-align: center;
+    }
+    .van-loading {
+      position: absolute;
+      left: 37%;
+    }
+  }
+  .card-content:last-child{
+     margin-bottom: 30px;
+  }
+  .van-button--normal{
+    float: left;
+    margin-left: 35%;
+  }
 }
 </style>
diff --git a/src/pages/phone/domesticStand.vue b/src/pages/phone/domesticStand.vue
index d06bfed97..cb8ff81b9 100644
--- a/src/pages/phone/domesticStand.vue
+++ b/src/pages/phone/domesticStand.vue
@@ -17,14 +17,15 @@
        </template>
      </van-search>
    </div>
-   <div class="card-box">
+   <div class="card-box" ref="cardBox" @scroll="scrool">
      <div v-if="loading">
        <van-loading size="24px" color="#3170A8">加载中...</van-loading>
      </div>
      <div v-else-if="!loading && standList.length" class="card-content" v-for="item in standList" :key="item.id">
        <div class="standTitle">
          <div v-if="titleType === 'POLICY'"  class="title">{{item.lawsNumber}}</div>
-         <div v-else class="title">{{item.standSortShow + '&nbsp&nbsp' + item.standNumber + '-' + item.standYear }}</div>
+         <div v-else-if="titleType !== 'POLICY' && item.standYear" class="title">{{item.standSortShow + '&nbsp&nbsp' + item.standNumber + '-' + item.standYear }}</div>
+         <div v-else class="title">{{item.standSortShow + '&nbsp&nbsp' + item.standNumber }}</div>
        </div>
        <div class="standContent">
          <div class="standState">{{item.standName}}</div>
@@ -63,6 +64,17 @@
            <span v-else style=" padding-left: 5px;">
                       {{ textStatusMap[item.textStatus] }}
          </span>
+           <!--           <span v-if="item.textStatusName === '废止' || item.textStatusName === '被代替'"-->
+           <!--                 style="color: #F56C6C; padding-left: 5px;">-->
+           <!--             {{item.textStatusName}}-->
+           <!--           </span>-->
+           <!--           <span v-else-if="item.textStatusName === '参考' || item.textStatusName === '现行有效'"-->
+           <!--                 style="color: #98E165; padding-left: 5px;">-->
+           <!--                      {{item.textStatusName }}-->
+           <!--         </span>-->
+           <!--           <span v-else style=" padding-left: 5px;">-->
+           <!--                      {{ item.textStatusName }}-->
+           <!--         </span>-->
          </div>
        </div>
        <div class="content-time">
@@ -79,6 +91,11 @@
        <van-empty description="暂无数据" />
      </div>
    </div>
+   <div v-if="moreFlag" class="bottom-box">
+     <div v-if="listFlag && !loading" class="list-box">没有更多数据了...</div>
+     <div v-else-if="!listFlag && moreFlag"  @click="moreList" >点击加载更多</div>
+     <van-loading v-else size="24px" color="#3170A8">加载中...</van-loading>
+   </div>
  </div>
 </template>
 
@@ -87,10 +104,15 @@ export default {
   name: "domesticStand",
   data(){
     return{
+      scrolled: '',
+      moreFlag: false,
+      loadingFlag: false,
+      listFlag: false,
       searchKey: '',
       titleType: '',
       titleName: '',
       loading: true,
+      page: 1,
       standList: [],
       standStateOptions: [], //标准文本状态
       lawsTextStateOptions: [], //政策文本状态
@@ -101,10 +123,35 @@ export default {
     }
   },
   methods:{
+    scrool(){
+      this.scrolled = this.$refs.cardBox.scrollTop
+      //获得可视区的高度
+      const windowHeight = this.$refs.cardBox.clientHeight
+      //获取滚动条的总高度
+      const scrollHeight = this.$refs.cardBox.scrollHeight
+      let windowScrolled  = this.scrolled + windowHeight
+      if(scrollHeight - windowScrolled < 100 && this.scrolled !== 0){
+        //把距离顶部的距离加上可视区域的高度
+        this.moreFlag = true
+      }else{
+        this.moreFlag = false
+      }
+    },
+    moreList(){
+      this.moreFlag = false
+      this.loadingFlag = true
+      this.page++
+      this.standSearch()
+    },
     onSearch(){
+      this.moreFlag = false
+      this.loading = true
+      this.standList = []
+      this.page = 1
       if(this.titleType === 'INLAND'){
         this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage',{
-          page: 1,
+          page: this.page,
+          standNumber: this.searchKey,
           pageSize: 20,
           standType: 'INLAND'
         },{
@@ -122,6 +169,7 @@ export default {
         this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage',{
           page: 1,
           pageSize: 20,
+          standNumber: this.searchKey,
           standType: 'FOREIGN'
         },{
           _this: this
@@ -134,16 +182,115 @@ export default {
           }
         },e=>{
         })
+      }else if(this.titleType === 'POLICY'){
+        this.$http.get('lawss/sarLawsInfo/page',{
+          page: 1,
+          pageSize: 20,
+          lawsNumber: this.searchKey,
+        },{
+          _this: this
+        }, res => {
+          if (res.ok){
+            this.standList = res.data.list
+            this.loading = false
+          }else {
+            this.$message.error(res.message)
+          }
+        }, e =>{
+          console.log(e);
+        })
+      }else{
+        this.$http.get("/lawss/NewsFeed/getNewsFeed", {
+          messageType: 'ZYBZFG',
+          standard: this.searchKey,
+          page: 1,
+          paeSize: 10
+        }, {
+          _this: this
+        }, res => {
+          if (res.ok){
+            this.standList = res.data
+            this.loading = false
+          }else {
+            this.$message.error(res.message)
+          }
+        }, e => {
+          console.log(e);
+        });
+      }
+    },
+    standSearch(){
+      this.listFlag = false
+      this.moreFlag = false
+      if(this.titleType === 'INLAND'){
+        this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage',{
+          page: this.page,
+          pageSize: 20,
+          standNumber: this.searchKey,
+          standType: 'INLAND'
+        },{
+          _this: this
+        },res=>{
+          if (res.ok){
+            if(res.data.list.length){
+              if(this.standList.length){
+                this.standList = this.standList.concat(res.data.list)
+              }else{
+                this.standList = res.data.list
+              }
+              this.loading = false
+            }else{
+              this.listFlag = true
+            }
+          }else {
+            this.$message.error(res.message)
+          }
+        },e=>{
+        })
+      }else if(this.titleType === 'FOREIGN'){
+        this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage',{
+          page: 1,
+          pageSize: 20,
+          standNumber: this.searchKey,
+          standType: 'FOREIGN'
+        },{
+          _this: this
+        },res=>{
+          if (res.ok){
+            if(res.data.list.length){
+              if(this.standList.length){
+                this.standList = this.standList.concat(res.data.list)
+              }else{
+                this.standList = res.data.list
+              }
+              this.loading = false
+            }else{
+              this.listFlag = true
+            }
+          }else {
+            this.$message.error(res.message)
+          }
+        },e=>{
+        })
       }else if(this.titleType === 'POLICY'){
        this.$http.get('lawss/sarLawsInfo/page',{
+         lawsNumber: this.searchKey,
          page: 1,
          pageSize: 20,
        },{
          _this: this
        }, res => {
          if (res.ok){
-           this.standList = res.data.list
-           this.loading = false
+           if(res.data.list.length){
+             if(this.standList.length){
+               this.standList = this.standList.concat(res.data.list)
+             }else{
+               this.standList = res.data.list
+             }
+             this.loading = false
+           }else{
+             this.listFlag = true
+           }
          }else {
            this.$message.error(res.message)
          }
@@ -153,14 +300,23 @@ export default {
       }else{
         this.$http.get("/lawss/NewsFeed/getNewsFeed", {
           messageType: 'ZYBZFG',
+          standard: this.searchKey,
           page: 1,
           paeSize: 10
         }, {
           _this: this
         }, res => {
           if (res.ok){
-            this.standList = res.data
-            this.loading = false
+            if(res.data.length){
+              if(this.standList.length){
+                this.standList = this.standList.concat(res.data)
+              }else{
+                this.standList = res.data
+              }
+              this.loading = false
+            }else{
+              this.listFlag = true
+            }
           }else {
             this.$message.error(res.message)
           }
@@ -193,7 +349,8 @@ export default {
   mounted() {
     this.titleType = this.$route.query.standType
     this.titleName = this.titleType === 'INLAND' ? '国内标准法规库' : (this.titleType === 'FOREIGN' ? '海外标准法规库' : this.titleType === 'POLICY' ? '国内外政策库' : '标准化动态库' )
-    this.onSearch()
+    this.standSearch()
+    this.$refs.cardBox.addEventListener('scroll', this.scrool);
     //从数据库中查询下拉框数据
     this.$http.get("sys/dictype/getDicTypeListCode", {}, {
       _this: this
@@ -249,8 +406,9 @@ export default {
     color: #FFFFFF;
   }
   .card-box{
-    height: 100%;
+    height: 85%;
     position: relative;
+    overflow-y: scroll;
     top: 100px;
   }
   .card-content{
@@ -298,6 +456,25 @@ export default {
     top: 40%;
     left: 37%;
   }
+  .bottom-box{
+    height: 40px;
+    width: 91%;
+    position: absolute;
+    bottom: 0;
+    text-align: center;
+    color: #3170A8;
+    .list-box{
+      color: #3170A8;
+      text-align: center;
+    }
+    .van-loading {
+      position: absolute;
+      left: 37%;
+    }
+  }
+  .card-content:last-child{
+    margin-bottom: 30px;
+  }
 }
 
 </style>

From 5e0c5a158414fce821fafae0b3b330386ddd54df Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Wed, 1 Jun 2022 17:35:55 +0800
Subject: [PATCH 02/13] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=20?=
 =?UTF-8?q?=E6=96=B0=E9=9C=80=E6=B1=82=20=E5=8A=A8=E6=80=81=E6=B6=88?=
 =?UTF-8?q?=E6=81=AF=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/home2/components/release/index.vue  |  40 +++++-
 .../home2/components/releaseBuss/index.vue    | 128 ++++++++++++++++++
 .../home2/components/releaseUs/index.vue      | 128 ++++++++++++++++++
 .../components/solicitopinions/index.vue      |  18 ++-
 src/pages/home2/index.vue                     |  14 +-
 5 files changed, 318 insertions(+), 10 deletions(-)
 create mode 100644 src/pages/home2/components/releaseBuss/index.vue
 create mode 100644 src/pages/home2/components/releaseUs/index.vue

diff --git a/src/pages/home2/components/release/index.vue b/src/pages/home2/components/release/index.vue
index b78c54f8b..241c77914 100644
--- a/src/pages/home2/components/release/index.vue
+++ b/src/pages/home2/components/release/index.vue
@@ -23,9 +23,21 @@
                   align="center"
                   width="55">
           </el-table-column>
+          <el-table-column
+                  label="标准编号">
+              <template slot-scope="scope">
+                  <a v-if="scope.row.standYear" class="table-jump" style="color: #333333"
+                     @click="handlePreview(scope.row)">{{ scope.row.standSort }} {{
+                      scope.row.standNumber
+                      }}-{{ scope.row.standYear }}</a>
+                  <a v-else @click="handlePreview(scope.row)" class="table-jump" style="color: #333333">
+                      {{ scope.row.standSort }}
+                      {{ scope.row.standNumber }}</a>
+              </template>
+          </el-table-column>
           <el-table-column
                   prop="standName"
-                  label="名称">
+                  label="标准名称">
               <template slot-scope="scope">
                   <span @click="handlePreview(scope.row)">{{ scope.row.standName }}</span>
               </template>
@@ -38,6 +50,7 @@
               </template>
           </el-table-column>
       </el-table>
+      <div class="more" @click="togo">更多 ⋙</div>
   </div>
 </template>
 
@@ -60,6 +73,9 @@ export default {
     // this.addDate()
   },
   methods: {
+      togo () {
+          this.$router.push('/processCenter')
+      },
     // 点击查看
     handlePreview (item) {
       let routeUrl = this.$router.resolve({
@@ -79,9 +95,13 @@ export default {
     getAdvice() {
       let obj = {}
       obj.limit = 10
-      this.$http.get('sarStandardsInfo/sar-standards-info/getStandInfoByList', obj, {
-        _this: this
-      }, res => {
+        this.$http.get("/lawss/NewsFeed/getNewsFeed", {
+            messageType: 'GNWBZFG',
+            page: 1,
+            paeSize: 10
+        }, {
+            _this: this
+        }, res => {
         let arr = res.data
         arr.forEach(item => {
           if(item.standName !== ""){
@@ -103,6 +123,18 @@ export default {
   }
   /deep/.el-table td > .cell{
     font-size: 13px;
+  }
+  /deep/.more {
+      position: absolute;
+      right: 0;
+      bottom: 0;
+      font-size: 12px;
+      float: right;
+      color: #4788c0;
+      &:hover {
+          color: #3a8ee6;
+          cursor: pointer;
+      }
   }
     width: 100%;
   .time-title {
diff --git a/src/pages/home2/components/releaseBuss/index.vue b/src/pages/home2/components/releaseBuss/index.vue
new file mode 100644
index 000000000..3d4eb5660
--- /dev/null
+++ b/src/pages/home2/components/releaseBuss/index.vue
@@ -0,0 +1,128 @@
+<!-- 企标发布 -->
+<template>
+  <div class="release">
+<!--    <ul>-->
+<!--      <li v-for="item in standardReleaseList" :key="item.id" class="time-title" >-->
+<!--          <div style="height: 18px;">-->
+<!--            <a @click="handlePreview(item)" style="color: #333333" class="table-jump">{{ item.standName }}</a>-->
+<!--              <span class="time">{{item.issueTime ? $moment(item.issueTime).format('YYYY-MM-DD') : '' }}</span>-->
+<!--          </div>-->
+<!--      </li>-->
+<!--    </ul>-->
+      <el-table
+              ref="selection"
+              :data="standardReleaseList"
+              tooltip-effect="dark"
+              border
+              style="cursor:pointer;"
+              :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">
+          style="width: 100%">
+          <el-table-column
+                  label="序号"
+                  type="index"
+                  align="center"
+                  width="55">
+          </el-table-column>
+          <el-table-column
+                  prop="standName"
+                  label="名称">
+              <template slot-scope="scope">
+                  <span @click="handlePreview(scope.row)">{{ scope.row.standName }}</span>
+              </template>
+          </el-table-column>
+          <el-table-column
+                  width="120"
+                  label="发布时间">
+              <template slot-scope="scope">
+                  <span>{{scope.row.issueTime ? $moment(scope.row.issueTime).format('YYYY-MM-DD') : '' }}</span>
+              </template>
+          </el-table-column>
+      </el-table>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'ReleaseBuss',
+  components: {},
+  mixins: [],
+  data() {
+    return {
+      putTime: '',
+      standardReleaseList: [],  //标准发布数据
+    }
+  },
+  computed: {},
+  watch: {},
+  mounted() {
+    this.getDate()
+    this.getAdvice()
+    // this.addDate()
+  },
+  methods: {
+    // 点击查看
+    handlePreview (item) {
+        let routeUrl = this.$router.resolve({
+            name: 'OtherBussStandardDetails',
+            params: {
+                id: item.id,
+                pageType: 'BUSINESS_STAND'
+            }
+        })
+        window.open(routeUrl.href, '_blank')
+    },
+    //截取时间
+    getDate (date) {
+      return date != null ? date.substring(0, date.indexOf(' ')) : ''
+    },
+    //获取数据
+    getAdvice() {
+      let obj = {}
+      obj.limit = 10
+      this.$http.get("/lawss/NewsFeed/getNewsFeed", {
+            messageType: 'QYBZFB',
+            page: 1,
+            paeSize: 10
+        }, {
+            _this: this
+        }, res => {
+        let arr = res.data
+        arr.forEach(item => {
+          if(item.standName !== ""){
+            this.standardReleaseList.push(item)
+          }
+        })
+      }, e => {
+      })
+    },
+  },
+
+}
+</script>
+
+<style lang="less" scoped>
+.release {
+  /deep/.el-table th > .cell {
+    font-size: 15px;
+  }
+  /deep/.el-table td > .cell{
+    font-size: 13px;
+  }
+    width: 100%;
+  .time-title {
+    margin: 15px;
+    .time {
+      float: right;
+      color:#333333;
+    }
+    a {
+      color: #ffffff;
+      &:hover {
+        color: #e9c851;
+        cursor:pointer;
+        text-decoration: underline;
+      }
+    }
+  }
+}
+</style>
diff --git a/src/pages/home2/components/releaseUs/index.vue b/src/pages/home2/components/releaseUs/index.vue
new file mode 100644
index 000000000..a456f9c2a
--- /dev/null
+++ b/src/pages/home2/components/releaseUs/index.vue
@@ -0,0 +1,128 @@
+<!-- 标准发布 -->
+<template>
+  <div class="release">
+<!--    <ul>-->
+<!--      <li v-for="item in standardReleaseList" :key="item.id" class="time-title" >-->
+<!--          <div style="height: 18px;">-->
+<!--            <a @click="handlePreview(item)" style="color: #333333" class="table-jump">{{ item.standName }}</a>-->
+<!--              <span class="time">{{item.issueTime ? $moment(item.issueTime).format('YYYY-MM-DD') : '' }}</span>-->
+<!--          </div>-->
+<!--      </li>-->
+<!--    </ul>-->
+      <el-table
+              ref="selection"
+              :data="standardReleaseList"
+              tooltip-effect="dark"
+              border
+              style="cursor:pointer;"
+              :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">
+          style="width: 100%">
+          <el-table-column
+                  label="序号"
+                  type="index"
+                  align="center"
+                  width="55">
+          </el-table-column>
+          <el-table-column
+                  prop="standName"
+                  label="名称">
+              <template slot-scope="scope">
+                  <span @click="handlePreview(scope.row)">{{ scope.row.standName }}</span>
+              </template>
+          </el-table-column>
+          <el-table-column
+                  width="120"
+                  label="发布时间">
+              <template slot-scope="scope">
+                  <span>{{scope.row.issueTime ? $moment(scope.row.issueTime).format('YYYY-MM-DD') : '' }}</span>
+              </template>
+          </el-table-column>
+      </el-table>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'ReleaseUs',
+  components: {},
+  mixins: [],
+  data() {
+    return {
+      putTime: '',
+      standardReleaseList: [],  //标准发布数据
+    }
+  },
+  computed: {},
+  watch: {},
+  mounted() {
+    this.getDate()
+    this.getAdvice()
+    // this.addDate()
+  },
+  methods: {
+    // 点击查看
+    handlePreview (item) {
+      let routeUrl = this.$router.resolve({
+        name: 'OtherStandardDetails',
+        params: {
+          id: item.id,
+          pageType: item.standType + '_STAND'
+        }
+      })
+      window.open(routeUrl.href, '_blank')
+    },
+    //截取时间
+    getDate (date) {
+      return date != null ? date.substring(0, date.indexOf(' ')) : ''
+    },
+    //获取数据
+    getAdvice() {
+      let obj = {}
+      obj.limit = 10
+        this.$http.get("/lawss/NewsFeed/getNewsFeed", {
+            messageType: 'ZYBZFG',
+            page: 1,
+            paeSize: 10
+        }, {
+            _this: this
+        }, res => {
+        let arr = res.data
+        arr.forEach(item => {
+          if(item.standName !== ""){
+            this.standardReleaseList.push(item)
+          }
+        })
+      }, e => {
+      })
+    },
+  },
+
+}
+</script>
+
+<style lang="less" scoped>
+.release {
+  /deep/.el-table th > .cell {
+    font-size: 15px;
+  }
+  /deep/.el-table td > .cell{
+    font-size: 13px;
+  }
+    width: 100%;
+  .time-title {
+    margin: 15px;
+    .time {
+      float: right;
+      color:#333333;
+    }
+    a {
+      color: #ffffff;
+      &:hover {
+        color: #e9c851;
+        cursor:pointer;
+        text-decoration: underline;
+      }
+    }
+  }
+}
+</style>
diff --git a/src/pages/home2/components/solicitopinions/index.vue b/src/pages/home2/components/solicitopinions/index.vue
index 0ed6e33f3..dbc3843a4 100644
--- a/src/pages/home2/components/solicitopinions/index.vue
+++ b/src/pages/home2/components/solicitopinions/index.vue
@@ -37,11 +37,7 @@
         label="结束时间">
       </el-table-column>
     </el-table>
-    <div
-      style="height: 20px;background-color: #fff;text-align: right;color: #4788c0; position: absolute; bottom: 5px; right: 5px">
-      <span style="margin-right: 10px;cursor: pointer;font-size: 12px"
-            @click="$router.push('standardForComments')">更多 ⋙</span>
-    </div>
+      <div class="more" @click="$router.push('standardForComments')">更多 ⋙</div>
   </div>
 </template>
 
@@ -97,6 +93,18 @@ export default {
 
 <style lang="less" scoped>
 .solicitopinions {
+    /deep/.more {
+        position: absolute;
+        right: 0;
+        bottom: 0;
+        font-size: 12px;
+        float: right;
+        color: #4788c0;
+        &:hover {
+            color: #3a8ee6;
+            cursor: pointer;
+        }
+    }
   /deep/.el-table__body-wrapper {
     max-height: calc(65vh - 101px);
     overflow-y: auto;
diff --git a/src/pages/home2/index.vue b/src/pages/home2/index.vue
index 482136a58..5e1f016da 100644
--- a/src/pages/home2/index.vue
+++ b/src/pages/home2/index.vue
@@ -16,9 +16,17 @@
                  <solicitOpinions></solicitOpinions>
              </el-tab-pane>
              <el-tab-pane name="release">
-                 <span slot="label"><i class="el-icon-s-promotion"></i> 标准发布</span>
+                 <span slot="label"><i class="el-icon-s-promotion"></i> 国内外标准法规入库</span>
                  <release></release>
              </el-tab-pane>
+            <el-tab-pane name="releaseUs">
+               <span slot="label"><i class="el-icon-s-promotion"></i> 在研标准法规入库</span>
+               <releaseUs></releaseUs>
+            </el-tab-pane>
+           <el-tab-pane name="releaseBuss">
+               <span slot="label"><i class="el-icon-s-promotion"></i> 企业标准发布</span>
+               <releaseBuss></releaseBuss>
+           </el-tab-pane>
            </el-tabs>
          </div>
        </div>
@@ -37,6 +45,8 @@
 <script>
 import searchGroup from './components/searchGroup'
 import release from './components/release'
+import releaseUs from './components/releaseUs'
+import releaseBuss from './components/releaseBuss'
 import solicitOpinions from './components/solicitopinions'
 import navMenu from './components/navMenu'
 import todoList from './components/todoList'
@@ -47,6 +57,8 @@ export default {
     searchGroup,
     solicitOpinions,
     release,
+    releaseUs,
+    releaseBuss,
     navMenu,
     todoList,
     Empennage,

From 7a3afc097563d1aab78cdca11850929cc7468235 Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Thu, 2 Jun 2022 16:47:18 +0800
Subject: [PATCH 03/13] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=20?=
 =?UTF-8?q?=E5=8A=A8=E6=80=81=E6=B6=88=E6=81=AF=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/home2/components/release/index.vue  |  80 ++++++++-----
 .../home2/components/releaseBuss/index.vue    |  88 +++++++++++----
 .../home2/components/releaseUs/index.vue      | 106 ++++++++++++++----
 src/pages/home2/index.vue                     |   8 +-
 .../creatProcess/qbrk-product/step13.vue      |   3 +
 .../pages/creatProcess/qbrk/step12.vue        |   8 +-
 .../pages/creatProcess/qbrk/step13.vue        |   7 ++
 7 files changed, 227 insertions(+), 73 deletions(-)

diff --git a/src/pages/home2/components/release/index.vue b/src/pages/home2/components/release/index.vue
index 241c77914..e380ef56a 100644
--- a/src/pages/home2/components/release/index.vue
+++ b/src/pages/home2/components/release/index.vue
@@ -16,7 +16,6 @@
               border
               style="cursor:pointer;"
               :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">
-          style="width: 100%">
           <el-table-column
                   label="序号"
                   type="index"
@@ -26,31 +25,33 @@
           <el-table-column
                   label="标准编号">
               <template slot-scope="scope">
-                  <a v-if="scope.row.standYear" class="table-jump" style="color: #333333"
-                     @click="handlePreview(scope.row)">{{ scope.row.standSort }} {{
-                      scope.row.standNumber
-                      }}-{{ scope.row.standYear }}</a>
-                  <a v-else @click="handlePreview(scope.row)" class="table-jump" style="color: #333333">
-                      {{ scope.row.standSort }}
-                      {{ scope.row.standNumber }}</a>
+                  <span @click="handlePreview(scope.row)">{{ scope.row.standard }}</span>
               </template>
           </el-table-column>
           <el-table-column
                   prop="standName"
                   label="标准名称">
               <template slot-scope="scope">
-                  <span @click="handlePreview(scope.row)">{{ scope.row.standName }}</span>
+                  <span @click="handlePreview(scope.row)">{{ scope.row.standardName }}</span>
               </template>
           </el-table-column>
           <el-table-column
                   width="120"
                   label="发布时间">
               <template slot-scope="scope">
-                  <span>{{scope.row.issueTime ? $moment(scope.row.issueTime).format('YYYY-MM-DD') : '' }}</span>
+                  <span>{{scope.row.releaseDate ? $moment(scope.row.releaseDate).format('YYYY-MM-DD') : '' }}</span>
               </template>
           </el-table-column>
       </el-table>
-      <div class="more" @click="togo">更多 ⋙</div>
+      <div class="more" v-if="!pageVerify" @click="togo">更多 ⋙</div>
+      <loading :loading="loading">加载中...</loading>
+      <pagination
+              v-if="pageVerify"
+              style="position: static;"
+              :page="page"
+              :total="total"
+              @pageChange="pageChange"
+              @pageSizeChange="pageSizeChange"></pagination>
   </div>
 </template>
 
@@ -61,8 +62,13 @@ export default {
   mixins: [],
   data() {
     return {
-      putTime: '',
-      standardReleaseList: [],  //标准发布数据
+        loading: false,
+        pageVerify: false,
+        page: 1,
+        pageSize: 10,
+        total: 0,
+        putTime: '',
+        standardReleaseList: [],  //标准发布数据
     }
   },
   computed: {},
@@ -73,16 +79,33 @@ export default {
     // this.addDate()
   },
   methods: {
+      pageChange(page) {
+          this.page = page
+          this.pageSize = this.$store.getters.userInfo.configContent
+          this.getAdvice()
+      },
+      // 分页每页显示数改变后方法
+      pageSizeChange(pageSize) {
+          this.pageSize = this.$store.getters.userInfo.configContent
+          this.getAdvice()
+          // 此处需要调用接口，修改个人配置
+      },
       togo () {
-          this.$router.push('/processCenter')
+        if(this.total && this.total > 10){
+            this.pageVerify = true
+            this.pageSize = this.$store.getters.userInfo.configContent
+        }else {
+            this.pageVerify = false
+        }
+        this.getAdvice()
       },
     // 点击查看
     handlePreview (item) {
       let routeUrl = this.$router.resolve({
         name: 'OtherStandardDetails',
         params: {
-          id: item.id,
-          pageType: item.standType + '_STAND'
+          id: item.standardId,
+          pageType: item.resourceType + '_STAND'
         }
       })
       window.open(routeUrl.href, '_blank')
@@ -93,22 +116,21 @@ export default {
     },
     //获取数据
     getAdvice() {
-      let obj = {}
-      obj.limit = 10
-        this.$http.get("/lawss/NewsFeed/getNewsFeed", {
+      this.loading = true
+      this.$http.get("/lawss/NewsFeed/getNewsFeed", {
             messageType: 'GNWBZFG',
-            page: 1,
-            paeSize: 10
+            page: this.page,
+            pageSize: this.pageSize
         }, {
-            _this: this
+            _this: this,loading: 'loading'
         }, res => {
-        let arr = res.data
-        arr.forEach(item => {
-          if(item.standName !== ""){
-            this.standardReleaseList.push(item)
-          }
-        })
+            this.standardReleaseList = res.data.records
+            this.total = res.data.total
+            this.loading = false
       }, e => {
+            this.loading = false
+            this.standardReleaseList = []
+            this.total = 0
       })
     },
   },
@@ -127,7 +149,7 @@ export default {
   /deep/.more {
       position: absolute;
       right: 0;
-      bottom: 0;
+      bottom: 2px;
       font-size: 12px;
       float: right;
       color: #4788c0;
diff --git a/src/pages/home2/components/releaseBuss/index.vue b/src/pages/home2/components/releaseBuss/index.vue
index 3d4eb5660..b0648aee3 100644
--- a/src/pages/home2/components/releaseBuss/index.vue
+++ b/src/pages/home2/components/releaseBuss/index.vue
@@ -16,7 +16,6 @@
               border
               style="cursor:pointer;"
               :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">
-          style="width: 100%">
           <el-table-column
                   label="序号"
                   type="index"
@@ -24,20 +23,35 @@
                   width="55">
           </el-table-column>
           <el-table-column
-                  prop="standName"
-                  label="名称">
+                  label="标准编号">
               <template slot-scope="scope">
-                  <span @click="handlePreview(scope.row)">{{ scope.row.standName }}</span>
+                  <span @click="handlePreview(scope.row)">{{ scope.row.standard }}</span>
+              </template>
+          </el-table-column>
+          <el-table-column
+                  prop="standName"
+                  label="标准名称">
+              <template slot-scope="scope">
+                  <span @click="handlePreview(scope.row)">{{ scope.row.standardName }}</span>
               </template>
           </el-table-column>
           <el-table-column
                   width="120"
                   label="发布时间">
               <template slot-scope="scope">
-                  <span>{{scope.row.issueTime ? $moment(scope.row.issueTime).format('YYYY-MM-DD') : '' }}</span>
+                  <span>{{scope.row.releaseDate ? $moment(scope.row.releaseDate).format('YYYY-MM-DD') : '' }}</span>
               </template>
           </el-table-column>
       </el-table>
+      <div class="more" v-if="!pageVerify" @click="togo">更多 ⋙</div>
+      <loading :loading="loading">加载中...</loading>
+      <pagination
+              v-if="pageVerify"
+              style="position: static;"
+              :page="page"
+              :total="total"
+              @pageChange="pageChange"
+              @pageSizeChange="pageSizeChange"></pagination>
   </div>
 </template>
 
@@ -48,6 +62,11 @@ export default {
   mixins: [],
   data() {
     return {
+      loading: false,
+      pageVerify: false,
+      page: 1,
+      pageSize: 10,
+      total: 0,
       putTime: '',
       standardReleaseList: [],  //标准发布数据
     }
@@ -60,12 +79,32 @@ export default {
     // this.addDate()
   },
   methods: {
+      pageChange(page) {
+          this.page = page
+          this.pageSize = this.$store.getters.userInfo.configContent
+          this.getAdvice()
+      },
+      // 分页每页显示数改变后方法
+      pageSizeChange(pageSize) {
+          this.pageSize = this.$store.getters.userInfo.configContent
+          this.getAdvice()
+          // 此处需要调用接口，修改个人配置
+      },
+      togo () {
+          if(this.total && this.total > 10){
+              this.pageVerify = true
+              this.pageSize = this.$store.getters.userInfo.configContent
+          }else {
+              this.pageVerify = false
+          }
+          this.getAdvice()
+      },
     // 点击查看
     handlePreview (item) {
         let routeUrl = this.$router.resolve({
             name: 'OtherBussStandardDetails',
             params: {
-                id: item.id,
+                id: item.standardId,
                 pageType: 'BUSINESS_STAND'
             }
         })
@@ -77,23 +116,22 @@ export default {
     },
     //获取数据
     getAdvice() {
-      let obj = {}
-      obj.limit = 10
-      this.$http.get("/lawss/NewsFeed/getNewsFeed", {
+        this.loading = true
+        this.$http.get("/lawss/NewsFeed/getNewsFeed", {
             messageType: 'QYBZFB',
-            page: 1,
-            paeSize: 10
+            page: this.page,
+            pageSize: this.pageSize
         }, {
-            _this: this
+            _this: this,loading: 'loading'
         }, res => {
-        let arr = res.data
-        arr.forEach(item => {
-          if(item.standName !== ""){
-            this.standardReleaseList.push(item)
-          }
+            this.standardReleaseList = res.data.records
+            this.total = res.data.total
+            this.loading = false
+        }, e => {
+            this.loading = false
+            this.standardReleaseList = []
+            this.total = 0
         })
-      }, e => {
-      })
     },
   },
 
@@ -108,6 +146,18 @@ export default {
   /deep/.el-table td > .cell{
     font-size: 13px;
   }
+    /deep/.more {
+        position: absolute;
+        right: 0;
+        bottom: 2px;
+        font-size: 12px;
+        float: right;
+        color: #4788c0;
+        &:hover {
+            color: #3a8ee6;
+            cursor: pointer;
+        }
+    }
     width: 100%;
   .time-title {
     margin: 15px;
diff --git a/src/pages/home2/components/releaseUs/index.vue b/src/pages/home2/components/releaseUs/index.vue
index a456f9c2a..b30c59bd0 100644
--- a/src/pages/home2/components/releaseUs/index.vue
+++ b/src/pages/home2/components/releaseUs/index.vue
@@ -16,7 +16,6 @@
               border
               style="cursor:pointer;"
               :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">
-          style="width: 100%">
           <el-table-column
                   label="序号"
                   type="index"
@@ -24,20 +23,36 @@
                   width="55">
           </el-table-column>
           <el-table-column
-                  prop="standName"
-                  label="名称">
+                  prop="standard"
+                  label="标准编号">
               <template slot-scope="scope">
-                  <span @click="handlePreview(scope.row)">{{ scope.row.standName }}</span>
+                  <span @click="handlePreview(scope.row)">{{ scope.row.standard }}</span>
+              </template>
+          </el-table-column>
+          <el-table-column
+                  prop="standardName"
+                  label="标准名称">
+              <template slot-scope="scope">
+                  <span @click="handlePreview(scope.row)">{{ scope.row.standardName }}</span>
               </template>
           </el-table-column>
           <el-table-column
                   width="120"
-                  label="发布时间">
+                  label="文本状态">
               <template slot-scope="scope">
-                  <span>{{scope.row.issueTime ? $moment(scope.row.issueTime).format('YYYY-MM-DD') : '' }}</span>
+                  <span>{{ textStatusMap[scope.row.textState] }}</span>
               </template>
           </el-table-column>
       </el-table>
+      <div class="more" @click="togo">更多 ⋙</div>
+      <loading :loading="loading">加载中...</loading>
+      <pagination
+              v-if="pageVerify"
+              style="position: static;"
+              :page="page"
+              :total="total"
+              @pageChange="pageChange"
+              @pageSizeChange="pageSizeChange"></pagination>
   </div>
 </template>
 
@@ -48,25 +63,65 @@ export default {
   mixins: [],
   data() {
     return {
+      loading: false,
+      pageVerify: false,
+      page: 1,
+      pageSize: 10,
+      total: 0,
       putTime: '',
       standardReleaseList: [],  //标准发布数据
+      textStatusMap: {} // 文本状态id与name对应
     }
   },
   computed: {},
   watch: {},
   mounted() {
+      this.$http.get('sys/dictype/getDicTypeListCode', '', {
+          _this: this
+      }, res => {
+            if (res.data.WBZTCLASS !== undefined && res.data.WBZTCLASS !== null){
+                this.setMap(res.data.WBZTCLASS) // 文本状态
+            }
+      }, e => {
+      })
     this.getDate()
     this.getAdvice()
     // this.addDate()
   },
   methods: {
+      pageChange(page) {
+          this.page = page
+          this.pageSize = this.$store.getters.userInfo.configContent
+          this.getAdvice()
+      },
+      // 分页每页显示数改变后方法
+      pageSizeChange(pageSize) {
+          this.pageSize = this.$store.getters.userInfo.configContent
+          this.getAdvice()
+          // 此处需要调用接口，修改个人配置
+      },
+      togo () {
+          if(this.total && this.total > 10){
+              this.pageVerify = true
+              this.pageSize = this.$store.getters.userInfo.configContent
+          }else {
+              this.pageVerify = false
+          }
+          this.getAdvice()
+      },
+      // 将文本状态的id与name对应
+      setMap(data) {
+          data.forEach(item => {
+              this.$set(this.textStatusMap, item.value, item.label)
+          })
+      },
     // 点击查看
     handlePreview (item) {
       let routeUrl = this.$router.resolve({
         name: 'OtherStandardDetails',
         params: {
-          id: item.id,
-          pageType: item.standType + '_STAND'
+          id: item.standardId,
+          pageType: item.resourceType + '_STAND'
         }
       })
       window.open(routeUrl.href, '_blank')
@@ -77,23 +132,22 @@ export default {
     },
     //获取数据
     getAdvice() {
-      let obj = {}
-      obj.limit = 10
+        this.loading = true
         this.$http.get("/lawss/NewsFeed/getNewsFeed", {
             messageType: 'ZYBZFG',
-            page: 1,
-            paeSize: 10
+            page: this.page,
+            pageSize: this.pageSize
         }, {
-            _this: this
+            _this: this,loading: 'loading'
         }, res => {
-        let arr = res.data
-        arr.forEach(item => {
-          if(item.standName !== ""){
-            this.standardReleaseList.push(item)
-          }
+            this.standardReleaseList = res.data.records
+            this.total = res.data.total
+            this.loading = false
+        }, e => {
+            this.loading = false
+            this.standardReleaseList = []
+            this.total = 0
         })
-      }, e => {
-      })
     },
   },
 
@@ -108,6 +162,18 @@ export default {
   /deep/.el-table td > .cell{
     font-size: 13px;
   }
+    /deep/.more {
+        position: absolute;
+        right: 0;
+        bottom: 2px;
+        font-size: 12px;
+        float: right;
+        color: #4788c0;
+        &:hover {
+            color: #3a8ee6;
+            cursor: pointer;
+        }
+    }
     width: 100%;
   .time-title {
     margin: 15px;
diff --git a/src/pages/home2/index.vue b/src/pages/home2/index.vue
index 5e1f016da..1f3dfe2f7 100644
--- a/src/pages/home2/index.vue
+++ b/src/pages/home2/index.vue
@@ -15,15 +15,15 @@
                  <span slot="label"><i class="el-icon-s-order"></i> 标准征求意见</span>
                  <solicitOpinions></solicitOpinions>
              </el-tab-pane>
-             <el-tab-pane name="release">
+             <el-tab-pane name="release" style="overflow-y: auto;height: 100%">
                  <span slot="label"><i class="el-icon-s-promotion"></i> 国内外标准法规入库</span>
                  <release></release>
              </el-tab-pane>
-            <el-tab-pane name="releaseUs">
-               <span slot="label"><i class="el-icon-s-promotion"></i> 在研标准法规入库</span>
+            <el-tab-pane name="releaseUs" style="overflow-y: auto;height: 100%">
+               <span slot="label"><i class="el-icon-s-operation"></i> 在研标准法规入库</span>
                <releaseUs></releaseUs>
             </el-tab-pane>
-           <el-tab-pane name="releaseBuss">
+           <el-tab-pane name="releaseBuss" style="overflow-y: auto;height: 100%">
                <span slot="label"><i class="el-icon-s-promotion"></i> 企业标准发布</span>
                <releaseBuss></releaseBuss>
            </el-tab-pane>
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue
index 279f5ffa9..3563153bd 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue
@@ -2298,6 +2298,7 @@
                 //   this.sarStandardsInfoEO.country = item.country.split(",");
                 // }
                 this.fileInfoHandle()
+                this.isSubmit = true
                 this.saveLoading = true
                 let _formData = new FormData()
                 _formData.append('id', this.bpnId || '')
@@ -2313,10 +2314,12 @@
                     commentText: this.formTongGuo.commentText
                 }))
                 saveTaskForPub(_formData).then(res => {
+                    this.isSubmit = false
                     this.saveLoading = false
                     this.$message.success('保存成功')
                     this.bpnId = res.result
                 }).catch(e => {
+                    this.isSubmit = false
                     this.saveLoading = false
                 })
             },
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue
index c6675e43b..1647257d6 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue
@@ -2339,6 +2339,7 @@
                 // }
                 this.fileInfoHandle()
                 this.saveLoading = true
+                this.isSubmit = true
                 let _formData = new FormData()
                 _formData.append('id', this.bpnId || '')
                 _formData.append('createUser', this.$store.getters.userInfo.userId)
@@ -2355,10 +2356,12 @@
                 }))
                 saveTaskForPub(_formData).then(res => {
                     this.saveLoading = false
+                    this.isSubmit = false
                     this.$message.success('保存成功')
                     this.bpnId = res.result
                 }).catch(e => {
                     this.saveLoading = false
+                    this.isSubmit = false
                 })
             },
             fileInfoHandle(){
@@ -2475,6 +2478,7 @@
                 this.$refs['formTongGuo'].validate((valid) => {
                     if (valid) {
                         this.isSubmit = true
+                        this.saveLoading = true
                         this.form.commentText = this.formTongGuo.commentText
                         this.form.approvalOpinion = this.formTongGuo.approvalOpinion
                         this.form.topId = this.pId
@@ -2490,7 +2494,7 @@
                                 // this.$message.success(res.message)
                                 // 流程提交之后，应该流转至待办任务页面
                                 this.isSubmit = false
-                                this.submitLoading = false
+                                this.saveLoading = false
                                 this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
                                 // this.processCreateBuss(json)
                                 // if(this.formTongGuo.approvalOpinion === '1'){
@@ -2502,6 +2506,8 @@
                                 //     this.processCreateLaws(json)
                                 // }
                             }else {
+                                this.isSubmit = false
+                                this.saveLoading = false
                                 this.$message.success(res.message)
                             }
                         })
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue
index 8b1c360f5..018bb827c 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue
@@ -2340,6 +2340,7 @@
                 //   this.sarStandardsInfoEO.country = item.country.split(",");
                 // }
                 this.fileInfoHandle()
+                this.isSubmit = true
                 this.saveLoading = true
                 let _formData = new FormData()
                 _formData.append('id', this.bpnId || '')
@@ -2356,10 +2357,12 @@
                     commentText: this.formTongGuo.commentText
                 }))
                 saveTaskForPub(_formData).then(res => {
+                    this.isSubmit = false
                     this.saveLoading = false
                     this.$message.success('保存成功')
                     this.bpnId = res.result
                 }).catch(e => {
+                    this.isSubmit = false
                     this.saveLoading = false
                 })
             },
@@ -2479,6 +2482,7 @@
                         this.$refs['formTongGuo'].validate((valid) => {
                             if (valid) {
                                 this.isSubmit = true
+                                this.saveLoading = true
                                 this.form.commentText = this.formTongGuo.commentText
                                 this.form.approvalOpinion = this.formTongGuo.approvalOpinion
                                 this.form.topId = this.pId
@@ -2494,6 +2498,7 @@
                                         // this.$message.success(res.message)
                                         // 流程提交之后，应该流转至待办任务页面
                                         this.isSubmit = false
+                                        this.saveLoading = false
                                         this.processCreateBuss(json)
                                         // if(this.formTongGuo.approvalOpinion === '1'){
                                         //     this.$message.warning("驳回成功")
@@ -2504,6 +2509,8 @@
                                         //     this.processCreateLaws(json)
                                         // }
                                     }else {
+                                        this.isSubmit = false
+                                        this.saveLoading = false
                                         this.$message.success(res.message)
                                     }
                                 })

From c3cd41150d829770e0371dc5d56e3280a9d826f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Mon, 6 Jun 2022 13:17:50 +0800
Subject: [PATCH 04/13] =?UTF-8?q?=E6=88=91=E7=9A=84=E9=97=AE=E7=AD=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../my-questions/components/answerItem.vue    |  190 +++
 .../components/questionItemInfo.vue           |   53 +-
 .../components/questions-item.vue             |    8 +-
 .../my-questions/components/stand-item.vue    |    5 +-
 .../personal/pages/my-questions/index.vue     | 1147 ++++++++++++++++-
 5 files changed, 1341 insertions(+), 62 deletions(-)
 create mode 100644 src/pages/personal/pages/my-questions/components/answerItem.vue

diff --git a/src/pages/personal/pages/my-questions/components/answerItem.vue b/src/pages/personal/pages/my-questions/components/answerItem.vue
new file mode 100644
index 000000000..2f6d9e2fc
--- /dev/null
+++ b/src/pages/personal/pages/my-questions/components/answerItem.vue
@@ -0,0 +1,190 @@
+<!--我的回答-->
+<template>
+  <div>
+    <el-divider style="margin: 10px 0;"></el-divider>
+    <div id="message-content">
+      <el-form ref="form" :model="form" :rules="rules">
+        <el-form-item prop="textarea">
+          <el-input
+            type="textarea"
+            :rows="2"
+            placeholder="请输入回答内容"
+            v-model="form.textarea">
+          </el-input>
+        </el-form-item>
+        <div>
+          <el-button
+            type="primary"
+            class="common-button-primary"
+            size="small"
+            style="float: right;"
+            @click="handleSubmit"
+          >提交</el-button>
+          <el-button
+            type="primary"
+            class="common-button-primary"
+            size="small"
+            style="float: right;margin-right: 10px;"
+            @click="openUploadFileDialog"
+          >上传文件</el-button>
+          <el-button
+            type="primary"
+            class="common-button-primary"
+            size="small"
+            style="float: right;"
+            @click="queArchive"
+          >问题归档</el-button>
+          <el-button
+            type="primary"
+            class="common-button-primary"
+            size="small"
+            style="float: right;margin-right: 10px;"
+            @click="invitation"
+          >邀请</el-button>
+        </div>
+      </el-form>
+    </div>
+    <el-dialog
+      width='400px'
+      :visible.sync="importModalshowflagtemp"
+      title="上传文件"
+      :footer-hide="true"
+      append-to-body
+    >
+      <el-upload
+        multiple
+        drag
+        :on-success="uploadSuccess"
+        :before-upload="beforeUpload"
+        :on-remove="removeOneFile"
+        :action="actionPath"
+        accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx, .pdf, .PDF"
+        name="file"
+        :file-list="fileList"
+        ref="importFileAboutStand">
+        <i class="el-icon-upload"></i>
+        <div class="el-upload__text">点击或拖拽上传文件</div>
+      </el-upload>
+    </el-dialog>
+    <!--    选择回答人-->
+    <Role-tree
+      is-title="选择回答人"
+      :is-visible.sync="roleFlag"
+      @checkedRole="checkedRole"
+      :nodeList="nodeList"
+    ></Role-tree>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "answerItem",
+  data(){
+   return{
+     roleFlag: false,
+     nodeList: [],
+     // 上传地址
+     actionPath: 'api/att/attFile/uploadNew',
+     importModalshowflagtemp: false,
+     fileList: [],
+     form:{
+       textarea: '',
+       invitationId: '',
+       invitationName: '',
+     },
+     rules: {
+       textarea: [
+         { required: true, message: '请输入回复内容', trigger: 'blur' },
+         { min: 1, max: 500, message: '长度在 1 到 500 个字符', trigger: 'blur' }
+       ]
+     },
+   }
+  },
+  methods:{
+    //提交
+    handleSubmit(){
+      this.form.fileList = this.fileList
+      console.log(this.form);
+    },
+    //上传文件
+    openUploadFileDialog(){
+      this.importModalshowflagtemp = true
+    },
+    //上传成功
+    uploadSuccess(res,file,fileList){
+      if(res.ok){
+        this.fileList.push(res.data)
+        this.$message.success('上传成功')
+      }else{
+        this.$message.warning(res.message)
+        fileList.pop()
+      }
+      this.importModalshowflagtemp = false
+    },
+    //文件上传前
+    beforeUpload(file){
+      console.log(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;
+    },
+    //删除文件
+    removeOneFile(){
+      this.fileList.forEach((item,index) => {
+        if(item.name === file.name || item.id === file.id){
+          this.fileList.splice(index, 1)
+        }
+      })
+    },
+    checkedRole(data){
+      let asdId = sessionStorage.getItem('queId')
+      this.$http.postData('lawss/AskUser/insertAskUser',{
+        asdId: asdId,
+        usid:  data[0].id,
+      },{
+        _this: this
+      }, res => {
+        if(res.ok){
+          this.$message.success('邀请成功')
+        }
+      }, e => {
+
+      })
+    },
+    //问题归档
+    queArchive(){
+
+    },
+    //邀请
+    invitation(){
+      this.roleFlag = true
+    },
+  },
+};
+</script>
+
+<style lang="less" scoped>
+#message-content{
+
+}
+</style>
diff --git a/src/pages/personal/pages/my-questions/components/questionItemInfo.vue b/src/pages/personal/pages/my-questions/components/questionItemInfo.vue
index 9970b18d9..4ce7073a7 100644
--- a/src/pages/personal/pages/my-questions/components/questionItemInfo.vue
+++ b/src/pages/personal/pages/my-questions/components/questionItemInfo.vue
@@ -5,29 +5,72 @@
       <div class="row">
         <div class="item">
           <div>回答：
-            <span>{{question.question}}</span>
+            <span>{{answer. reply}}</span>
           </div>
         </div>
       </div>
       <div class="row">
         <div class="item">
-          <div>{{question.person}}
-            <span>{{question.modifyTime}}</span>
+          <div>附件：
+            <span style="color: #409EFF">{{answer.annex}}</span>
           </div>
         </div>
       </div>
+      <div class="row" style="float: right; margin-right: 10px">
+        <div class="item">
+          <div>{{answer.answerer}}
+            <span>{{answer.replyTime}}</span>
+          </div>
+        </div>
+      </div>
+<!--      <div>-->
+<!--        <el-checkbox v-model="checked">归档</el-checkbox>-->
+<!--      </div>-->
     </div>
+<!--    <div class="footer-box">-->
+
+<!--    </div>-->
   </div>
 </template>
 
 <script>
 export default {
-  name: "questionItemInfo"
+  name: "questionItemInfo",
+  props:['answer'],
+  data(){
+    return{
+      checked: true,
+    }
+  },
+  watch:{
+    answer: {
+      immediate: true,
+      deep: true,
+      handler(val) {
+        this.answer = val
+      }
+    }
+  }
 };
 </script>
 
 <style lang="less" scoped>
 #answer-item{
-
+  width: 100%;
+  min-width: 130px;
+  padding: 15px 5px;
+  .row {
+    line-height: 1.8;
+  }
+  .item {
+    display: inline-block;
+  }
+  .footer-box{
+    height: 200px;
+    width: 100%;
+    position: absolute;
+    bottom: 0;
+    border-top: 1px solid #cccccc;
+  }
 }
 </style>
diff --git a/src/pages/personal/pages/my-questions/components/questions-item.vue b/src/pages/personal/pages/my-questions/components/questions-item.vue
index 8eafd607a..660898090 100644
--- a/src/pages/personal/pages/my-questions/components/questions-item.vue
+++ b/src/pages/personal/pages/my-questions/components/questions-item.vue
@@ -5,14 +5,14 @@
     <div class="row">
       <div class="item">
         <div>提问：
-         <span>{{question.question}}</span>
+         <span>{{question.problemDescription}}</span>
         </div>
       </div>
     </div>
     <div class="row">
       <div class="item">
-        <div>{{question.person}}
-          <span>{{question.modifyTime}}</span>
+        <div>{{userName}}
+          <span>{{question.questionTime}}</span>
         </div>
       </div>
     </div>
@@ -28,6 +28,7 @@ export default {
   },
   data(){
     return{
+      userName: this.$store.getters.userInfo.userName,
     }
   },
   watch:{
@@ -35,7 +36,6 @@ export default {
       immediate: true,
       deep: true,
       handler(val){
-        console.log(val);
       }
     }
   }
diff --git a/src/pages/personal/pages/my-questions/components/stand-item.vue b/src/pages/personal/pages/my-questions/components/stand-item.vue
index 65eedfc51..585498bb7 100644
--- a/src/pages/personal/pages/my-questions/components/stand-item.vue
+++ b/src/pages/personal/pages/my-questions/components/stand-item.vue
@@ -4,12 +4,12 @@
     <div>
       <div class="row">
         <div class="item">
-          <span>{{stand.resCode}}</span>
+          <span>{{stand.standardEncdoing}}</span>
         </div>
       </div>
       <div class="row">
         <div class="item">
-          <span>{{stand.resName}}</span>
+          <span>{{stand.standardName}}</span>
         </div>
       </div>
     </div>
@@ -31,7 +31,6 @@ export default {
       immediate: true,
       deep: true,
       handler(val) {
-        console.log(val);
         this.stand = val
       }
     }
diff --git a/src/pages/personal/pages/my-questions/index.vue b/src/pages/personal/pages/my-questions/index.vue
index 698a2d7b0..0bfaecf5a 100644
--- a/src/pages/personal/pages/my-questions/index.vue
+++ b/src/pages/personal/pages/my-questions/index.vue
@@ -4,22 +4,22 @@
    <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.standNumber" placeholder="根据标准号查询"></el-input>
+         <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.standName" placeholder="根据标准名称查询"></el-input>
+         <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.keyCode" placeholder="根据关键词查询"></el-input>
+         <el-input v-model="questionSerach.problemDescription" placeholder="根据关键词查询"></el-input>
        </el-form-item>
        <el-form-item>
-         <el-button size="mini"  @click="">查询</el-button>
+         <el-button size="mini"  @click="standSearch">查询</el-button>
        </el-form-item>
        <el-form-item>
-         <el-button size="mini"  @click="">清空</el-button>
+         <el-button size="mini"  @click="delSearch">清空</el-button>
        </el-form-item>
        <el-form-item>
-         <el-button size="mini" type="primary" @click="">提问</el-button>
+         <el-button size="mini" type="primary" @click="queBtn" v-if="this.activeName !=='myQue'">提问</el-button>
        </el-form-item>
      </el-form>
    </div>
@@ -28,16 +28,20 @@
       type="border-card"
       style="height: 100%"
       class="type-tabs"
+      v-model="activeName"
+      @tab-click="handleClick"
       tab-position="left"
     >
-      <el-tab-pane label="我的提问">
+      <el-tab-pane name="myQue" label="我的提问">
         <div style="height: 100%">
           <el-tabs
             class="question-tabs"
             type="border-card"
+            v-model="activeType"
+            @tab-click="sourceClick"
             style="height: 100%"
             tab-position="left">
-            <el-tab-pane label="国内标准">
+            <el-tab-pane name="INLAND" label="国内标准">
               <div v-if="!standList || standList.length === 0">
                 <div style="padding: 20px;">
                   暂无数据
@@ -47,11 +51,13 @@
                 <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.name">
+                    <el-tab-pane class="com-box" :name="stand.standardId">
                       <template slot="label">
                         <stand-item :stand="stand"></stand-item>
                       </template>
@@ -65,21 +71,22 @@
                           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.name">
+                            <el-tab-pane class="com-box" :name="question.id">
                               <template slot="label">
                                 <questions-item :question="question"></questions-item>
                               </template>
-                              <div class="answer-box" >
-                                <template v-for="(item, index) in questionInfo.qaMsgEOListReverse">
+                              <div>
+                                <template v-for="(item, index) in answerList">
                                   <div class="clearfix">
-                                    <div class="item" >
-                                      <question-item-info ></question-item-info>
+                                    <div class="answer-box" >
+                                      <question-item-info :answer="item"></question-item-info>
                                     </div>
                                   </div>
-
                                 </template>
                               </div>
                             </el-tab-pane>
@@ -91,6 +98,248 @@
                 </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>
+                <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
+                          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>
+                                <template v-for="(item, index) in answerList">
+                                  <div class="clearfix">
+                                    <div class="answer-box" >
+                                      <question-item-info :answer="item"></question-item-info>
+                                    </div>
+                                  </div>
+                                </template>
+                              </div>
+                            </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>
+                <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
+                          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>
+                                <template v-for="(item, index) in answerList">
+                                  <div class="clearfix">
+                                    <div class="answer-box" >
+                                      <question-item-info :answer="item"></question-item-info>
+                                    </div>
+                                  </div>
+                                </template>
+                              </div>
+                            </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>
+                <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
+                          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>
+                                <template v-for="(item, index) in answerList">
+                                  <div class="clearfix">
+                                    <div class="answer-box" >
+                                      <question-item-info :answer="item"></question-item-info>
+                                    </div>
+                                  </div>
+                                </template>
+                              </div>
+                            </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%">
+          <el-tabs
+            class="question-tabs"
+            type="border-card"
+            @tab-click="sourceClick"
+            style="height: 100%"
+            tab-position="left">
+            <el-tab-pane label="国内标准">
+              <div v-if="!standList || standList.length === 0">
+                <div style="padding: 20px;">
+                  暂无数据
+                </div>
+              </div>
+              <div style="height: 100%" v-else>
+                <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
+                          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>
+                                <template v-for="(item, index) in answerList">
+                                  <div class="clearfix">
+                                    <div class="answer-box" >
+                                      <question-item-info :answer="item"></question-item-info>
+                                    </div>
+                                  </div>
+                                </template>
+                              </div>
+                              <div class="info-answer" >
+                                <answer-item></answer-item>
+                              </div>
+                            </el-tab-pane>
+                          </template>
+                        </el-tabs>
+                      </div>
+                    </el-tab-pane>
+                  </template>
+                </el-tabs>
+              </div>
+            </el-tab-pane>
             <el-tab-pane label="海外标准">
             </el-tab-pane>
             <el-tab-pane label="企业标准">
@@ -100,63 +349,844 @@
           </el-tabs>
         </div>
       </el-tab-pane>
-      <el-tab-pane label="我的回答">
-        <div>
-
-        </div>
-      </el-tab-pane>
-      <el-tab-pane label="我的订阅">
+      <el-tab-pane name="mySub" label="我的订阅">
         <div>
         </div>
       </el-tab-pane>
     </el-tabs>
   </div>
+  <!--提问弹窗  -->
+  <el-dialog
+    title="提交问题"
+    :visible.sync="dialogVisible"
+    width="600px"
+    :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>
+          <el-button size="mini" style="margin-left: 30px;" type="primary" @click="addList">选择标准</el-button>
+        </el-form-item>
+        <el-form-item label="问题" prop="problemDescription"  class="serch-form-item">
+          <el-input v-model="questionForm.problemDescription"></el-input>
+        </el-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;">
 
+    </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" @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"
+            @change="lawNumberSearch"
+            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] === '废止' || 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] === '废止' || 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] === '废止' || 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] === '废止' || 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] === '废止' || 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] === '废止' || 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] === '废止' || 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] === '废止' || 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] === '废止' || 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] === '废止' || 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] === '废止' || 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] === '废止' || 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] === '废止' || 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] === '废止' || 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>
 </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'
+
 export default {
   name: "index",
   components:{
     questionItemInfo,
     questionsItem,
+    answerItem,
     standItem
   },
   data(){
     return{
-      questionSerach:{
-        standNumber: '',
-        standName: '',
-        keyCode: '',
+      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'
       },
-      standList: [
-        {
-        name: '1',
-        resCode:'GB 17354-XXXX',
-        resName: '机动车安全运行条件',
-      }, {
-        name: '2',
-        resName: '汽车前后端防护装置',
-        resCode:'GB 14444-1',
-      }],
-      questionsList: [
-        {
-        name: '1',
-        question: '标准何时生效？',
-        person: this.$store.getters.userInfo.userName,
-        modifyTime: '2022-03-14 14:40:42',
-      }, {
-        name: '2',
-        person: this.$store.getters.userInfo.userName,
-        question: '第四条范围何时更改？',
-        modifyTime: '2022-03-14 14:40:42',
-      }],
+      textStatusMap: {},// 文本状态id与name对应
+      textState: [],
+      standModel: false,
+      lawInfoTableLoading: true,
+      handleSelectTableList: [],
+      lawInfoTable: [],
+      // 上传地址
+      actionPath: 'api/att/attFile/uploadNew',
+      fileList: [], //上传文件的列表
+      activeName: 'myQue',
+      activeType: 'INLAND',
+      activestand: '',
+      activeQue: '',
+      standType: 'INLAND',
+      dialogVisible: false,
+      questionForm:{
+        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: [],
     }
   },
+  mounted(){
+    this.standSearch()
+    // 查询各下拉框数据
+    this.$http.get("sys/dictype/getDicTypeListCode", "", {
+      _this: this,
+      loading: "loading"
+    }, res => {
+      this.setMap(res.data.WBZTCLASS);// 文本状态
+      this.textState = res.data.WBZTCLASS // 文本状态
+    }, e => {
+    });
+  },
+  methods:{
+    // 点击查看
+    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.dataSource = 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.standardId = this.handleSelectTableList[0].id
+        this.standModel = false
+      }else{
+        this.$message.warning('请选择一条数据进行添加')
+      }
+    },
+    //选择标准的查询按钮
+    searchLawBtn(){
+      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(){
+      console.log(this.activeName);
+      this.ansSearch()
+    },
+    sourceClick(){
+      this.questionSerach.classification = this.activeType
+      this.questionSerach.standardEncdoing = ''
+      this.standSearch()
+    },
+    standClick(){
+      this.queSearch()
+    },
+    questionClick(){
+      sessionStorage.setItem('queId', this.activeQue)
+       this.$http.get('lawss/AskQuestions/getAskQuestionsByakId',{
+         id: this.activeQue
+       },{
+         _this: this
+       }, res => {
+         this.answerList = res.data
+       }, e => {
+       })
+    },
+    //提问按钮
+    queBtn(){
+      this.dialogVisible = true
+    },
+    handleClose(){
+       this.dialogVisible = false
+    },
+    //清空
+    delSearch(){
+
+    },
+    //问题查询
+    queSearch(){
+       this.$http.get('lawss/AskQuestions/getAskQuestionsByStandardId',{
+         standardId: this.activestand,
+       },{
+         _this: this
+       }, res => {
+         this.questionsList = res.data
+         console.log(this.questionsList);
+       })
+    },
+    //回答查询
+    ansSearch(){
+      this.$http.get('lawss/AskQuestions/getReplyDetails',{
+        classification: this.questionSerach.classification,
+        answerer: this.$store.getters.userInfo.userId,
+      }, {
+        _this: this,
+      }, res => {
+
+      })
+    },
+    //查询标准
+    standSearch(){
+      this.$http.get('lawss/AskQuestions/getAskQuestionsDetails',{ ...this.questionSerach },{
+        _this: this
+      }, res =>{
+        this.standList = res.data
+      }, e => {
+
+      })
+    },
+    //文件上传前
+    beforeUploadTheme(file){
+      console.log(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.questionForm.standardId){
+        this.questionForm.fileList = this.fileList
+        console.log(this.questionForm);
+        this.$refs['queForm'].validate((valid) => {
+          if(valid){
+            this.$http.postData('lawss/AskQuestions/insertAskQuestions',{ ...this.questionForm },
+              {
+                _this: this
+              }, res => {
+                console.log(res);
+              }, e => {
+
+              })
+          }else{
+            return this.$message.warning('请输入问题')
+          }
+        })
+      }else{
+        this.$message.warning('请选择至少一条标准')
+      }
+    },
+  },
 };
 </script>
 
@@ -221,11 +1251,28 @@ export default {
 }
 .answer-box{
   height: auto;
-  min-height: 200px;
-  width: 100%;
-  min-width: 300px;
+  width: auto;
   background: #F5F7FA;
   float: right;
   margin: 20px 10px 0 80px;
 }
+.info-answer{
+  height: 200px;
+  width: 100%;
+  position: absolute;
+  bottom: 0;
+  //border-top: 1px solid #cccccc;
+}
+/deep/.el-upload-dragger{
+  width: 450px !important;
+}
+.el-input{
+  width: 90%;
+}
+/deep/.el-dialog__body{
+  padding: 10px;
+}
+ /deep/.el-upload-dragger {
+  height: 90px;
+}
 </style>

From c9bc703a40ac1a9187c6f642d4ed8a66dc4db23c Mon Sep 17 00:00:00 2001
From: zyd <zhangyanduan@91isoft.com>
Date: Mon, 6 Jun 2022 15:15:38 +0800
Subject: [PATCH 05/13] =?UTF-8?q?fix:=E6=89=8B=E6=9C=BA=E7=AB=AF=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2=E9=A1=B5=E9=9D=A2=E4=BC=98=E5=8C=96=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/phone/domesticStand.vue | 323 ++++++++++++++++++++++--------
 1 file changed, 234 insertions(+), 89 deletions(-)

diff --git a/src/pages/phone/domesticStand.vue b/src/pages/phone/domesticStand.vue
index cb8ff81b9..0021f28aa 100644
--- a/src/pages/phone/domesticStand.vue
+++ b/src/pages/phone/domesticStand.vue
@@ -24,8 +24,8 @@
      <div v-else-if="!loading && standList.length" class="card-content" v-for="item in standList" :key="item.id">
        <div class="standTitle">
          <div v-if="titleType === 'POLICY'"  class="title">{{item.lawsNumber}}</div>
-         <div v-else-if="titleType !== 'POLICY' && item.standYear" class="title">{{item.standSortShow + '&nbsp&nbsp' + item.standNumber + '-' + item.standYear }}</div>
-         <div v-else class="title">{{item.standSortShow + '&nbsp&nbsp' + item.standNumber }}</div>
+         <div v-else-if="titleType !== 'POLICY' && item.standYear" class="title">{{item.standSort + '&nbsp&nbsp' + item.standNumber + '-' + item.standYear }}</div>
+         <div v-else class="title">{{item.standSort + '&nbsp&nbsp' + item.standNumber }}</div>
        </div>
        <div class="standContent">
          <div class="standState">{{item.standName}}</div>
@@ -79,10 +79,10 @@
        </div>
        <div class="content-time">
          <div style="margin-top: 10px">
-         <span style="padding: 20px;">发布日期：
-           {{ item.issueTime ? $moment(item.issueTime).format("YYYY-MM-DD") : "" }}</span>
-           <span style="padding: 20px;" v-if="titleType === 'POLICY'">实施日期： {{item.XCXSSRQLAWS}}</span>
-           <span style="padding: 20px;" v-else>实施日期： {{item.putTime}}</span>
+         <span style="padding-left: 10px;min-width: 200px;">发布日期：
+           {{ item.issueTime ? (item.issueTime !== '' ? $moment(item.issueTime).format("YYYY-MM-DD") : "          ") : "          " }}</span>
+           <span style="padding-left: 15px;" v-if="titleType === 'POLICY'">实施日期： {{item.XCXSSRQLAWS}}</span>
+           <span style="padding-left: 15px;" v-else>实施日期： {{item.SSRQ}}</span>
          </div>
 
        </div>
@@ -149,46 +149,31 @@ export default {
       this.standList = []
       this.page = 1
       if(this.titleType === 'INLAND'){
-        this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage',{
+        // this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage',{
+        //   page: this.page,
+        //   standNumber: this.searchKey,
+        //   pageSize: 20,
+        //   standType: 'INLAND'
+        // },{
+        //   _this: this
+        // },res=>{
+        //   if (res.ok){
+        //     this.standList = res.data.list
+        //     this.loading = false
+        //   }else {
+        //     this.$message.error(res.message)
+        //   }
+        // },e=>{
+        // })
+        this.$http.post('search/searchCenter/searchSarBykey',{
+          selectIndex: 'stand',
+          selectValue: this.searchKey,
+          selectType: 'titleSearch',
+          standType: 'INLAND',
           page: this.page,
-          standNumber: this.searchKey,
-          pageSize: 20,
-          standType: 'INLAND'
+          pageSize: 20
         },{
-          _this: this
-        },res=>{
-          if (res.ok){
-            this.standList = res.data.list
-            this.loading = false
-          }else {
-            this.$message.error(res.message)
-          }
-        },e=>{
-        })
-      }else if(this.titleType === 'FOREIGN'){
-        this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage',{
-          page: 1,
-          pageSize: 20,
-          standNumber: this.searchKey,
-          standType: 'FOREIGN'
-        },{
-          _this: this
-        },res=>{
-          if (res.ok){
-            this.standList = res.data.list
-            this.loading = false
-          }else {
-            this.$message.error(res.message)
-          }
-        },e=>{
-        })
-      }else if(this.titleType === 'POLICY'){
-        this.$http.get('lawss/sarLawsInfo/page',{
-          page: 1,
-          pageSize: 20,
-          lawsNumber: this.searchKey,
-        },{
-          _this: this
+          _this: this,
         }, res => {
           if (res.ok){
             this.standList = res.data.list
@@ -196,9 +181,83 @@ export default {
           }else {
             this.$message.error(res.message)
           }
-        }, e =>{
-          console.log(e);
+        }, e => {
+          console.log(e)
         })
+      }else if(this.titleType === 'FOREIGN'){
+        // this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage',{
+        //   page: 1,
+        //   pageSize: 20,
+        //   standNumber: this.searchKey,
+        //   standType: 'FOREIGN'
+        // },{
+        //   _this: this
+        // },res=>{
+        //   if (res.ok){
+        //     this.standList = res.data.list
+        //     this.loading = false
+        //   }else {
+        //     this.$message.error(res.message)
+        //   }
+        // },e=>{
+        // })
+        this.$http.post('search/searchCenter/searchSarBykey',{
+          selectIndex: 'stand',
+          selectValue: this.searchKey,
+          selectType: 'titleSearch',
+          standType: 'FOREIGN',
+          page: this.page,
+          pageSize: 20
+        },{
+          _this: this,
+        }, res => {
+          if (res.ok){
+            this.standList = res.data.list
+            this.loading = false
+          }else {
+            this.$message.error(res.message)
+          }
+        }, e => {
+          console.log(e)
+        })
+
+      }else if(this.titleType === 'POLICY'){
+        // this.$http.get('lawss/sarLawsInfo/page',{
+        //   page: 1,
+        //   pageSize: 20,
+        //   lawsNumber: this.searchKey,
+        // },{
+        //   _this: this
+        // }, res => {
+        //   if (res.ok){
+        //     this.standList = res.data.list
+        //     this.loading = false
+        //   }else {
+        //     this.$message.error(res.message)
+        //   }
+        // }, e =>{
+        //   console.log(e);
+        // })
+        this.$http.post('search/searchCenter/searchSarBykey',{
+          selectIndex: 'laws',
+          selectValue: this.searchKey,
+          selectType: 'titleSearch',
+          type: 'laws',
+          page: this.page,
+          pageSize: 20
+        },{
+          _this: this,
+        }, res => {
+          if (res.ok){
+            this.standList = res.data.list
+            this.loading = false
+          }else {
+            this.$message.error(res.message)
+          }
+        }, e => {
+          console.log(e)
+        })
+
       }else{
         this.$http.get("/lawss/NewsFeed/getNewsFeed", {
           messageType: 'ZYBZFG',
@@ -223,15 +282,41 @@ export default {
       this.listFlag = false
       this.moreFlag = false
       if(this.titleType === 'INLAND'){
-        this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage',{
+        // this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage',{
+        //   page: this.page,
+        //   pageSize: 20,
+        //   standNumber: this.searchKey,
+        //   standType: 'INLAND'
+        // },{
+        //   _this: this
+        // },res=>{
+        //   if (res.ok){
+        //     if(res.data.list.length){
+        //       if(this.standList.length){
+        //         this.standList = this.standList.concat(res.data.list)
+        //       }else{
+        //         this.standList = res.data.list
+        //       }
+        //       this.loading = false
+        //     }else{
+        //       this.listFlag = true
+        //     }
+        //   }else {
+        //     this.$message.error(res.message)
+        //   }
+        // },e=>{
+        // })
+        this.$http.post('search/searchCenter/searchSarBykey',{
+          selectIndex: 'stand',
+          selectValue: this.searchKey,
+          selectType: 'titleSearch',
+          standType: 'INLAND',
           page: this.page,
-          pageSize: 20,
-          standNumber: this.searchKey,
-          standType: 'INLAND'
+          pageSize: 20
         },{
-          _this: this
-        },res=>{
-          if (res.ok){
+          _this: this,
+        }, res => {
+          if(res.ok){
             if(res.data.list.length){
               if(this.standList.length){
                 this.standList = this.standList.concat(res.data.list)
@@ -240,23 +325,52 @@ export default {
               }
               this.loading = false
             }else{
+              this.loading = false
               this.listFlag = true
             }
-          }else {
+          }else{
             this.$message.error(res.message)
           }
-        },e=>{
+        }, e => {
+          console.log(e)
         })
+
       }else if(this.titleType === 'FOREIGN'){
-        this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage',{
-          page: 1,
-          pageSize: 20,
-          standNumber: this.searchKey,
-          standType: 'FOREIGN'
+        // this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage',{
+        //   page: 1,
+        //   pageSize: 20,
+        //   standNumber: this.searchKey,
+        //   standType: 'FOREIGN'
+        // },{
+        //   _this: this
+        // },res=>{
+        //   if (res.ok){
+        //     if(res.data.list.length){
+        //       if(this.standList.length){
+        //         this.standList = this.standList.concat(res.data.list)
+        //       }else{
+        //         this.standList = res.data.list
+        //       }
+        //       this.loading = false
+        //     }else{
+        //       this.listFlag = true
+        //     }
+        //   }else {
+        //     this.$message.error(res.message)
+        //   }
+        // },e=>{
+        // })
+        this.$http.post('search/searchCenter/searchSarBykey',{
+          selectIndex: 'stand',
+          selectValue: this.searchKey,
+          selectType: 'titleSearch',
+          standType: 'FOREIGN',
+          page: this.page,
+          pageSize: 20
         },{
-          _this: this
-        },res=>{
-          if (res.ok){
+          _this: this,
+        }, res => {
+          if(res.ok){
             if(res.data.list.length){
               if(this.standList.length){
                 this.standList = this.standList.concat(res.data.list)
@@ -265,38 +379,68 @@ export default {
               }
               this.loading = false
             }else{
+              this.loading = false
               this.listFlag = true
             }
-          }else {
+          }else{
             this.$message.error(res.message)
           }
-        },e=>{
+        }, e => {
+          console.log(e)
         })
       }else if(this.titleType === 'POLICY'){
-       this.$http.get('lawss/sarLawsInfo/page',{
-         lawsNumber: this.searchKey,
-         page: 1,
-         pageSize: 20,
-       },{
-         _this: this
-       }, res => {
-         if (res.ok){
-           if(res.data.list.length){
-             if(this.standList.length){
-               this.standList = this.standList.concat(res.data.list)
-             }else{
-               this.standList = res.data.list
-             }
-             this.loading = false
-           }else{
-             this.listFlag = true
-           }
-         }else {
-           this.$message.error(res.message)
-         }
-       }, e =>{
-         console.log(e);
-       })
+       // this.$http.get('lawss/sarLawsInfo/page',{
+       //   lawsNumber: this.searchKey,
+       //   page: 1,
+       //   pageSize: 20,
+       // },{
+       //   _this: this
+       // }, res => {
+       //   if (res.ok){
+       //     if(res.data.list.length){
+       //       if(this.standList.length){
+       //         this.standList = this.standList.concat(res.data.list)
+       //       }else{
+       //         this.standList = res.data.list
+       //       }
+       //       this.loading = false
+       //     }else{
+       //       this.listFlag = true
+       //     }
+       //   }else {
+       //     this.$message.error(res.message)
+       //   }
+       // }, e =>{
+       //   console.log(e);
+       // })
+        this.$http.post('search/searchCenter/searchSarBykey',{
+          selectIndex: 'laws',
+          selectValue: this.searchKey,
+          selectType: 'titleSearch',
+          type: 'laws',
+          page: this.page,
+          pageSize: 20
+        },{
+          _this: this,
+        }, res => {
+          if(res.ok){
+            if(res.data.list.length){
+              if(this.standList.length){
+                this.standList = this.standList.concat(res.data.list)
+              }else{
+                this.standList = res.data.list
+              }
+              this.loading = false
+            }else{
+              this.loading = false
+              this.listFlag = true
+            }
+          }else{
+            this.$message.error(res.message)
+          }
+        }, e => {
+          console.log(e)
+        })
       }else{
         this.$http.get("/lawss/NewsFeed/getNewsFeed", {
           messageType: 'ZYBZFG',
@@ -315,6 +459,7 @@ export default {
               }
               this.loading = false
             }else{
+              this.loading = false
               this.listFlag = true
             }
           }else {

From ec05a64761e800b540b3eb3200198f3c34bf5a8b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Mon, 6 Jun 2022 15:20:28 +0800
Subject: [PATCH 06/13] commit

---
 .../personal/pages/my-questions/index.vue     | 496 +++++++++++++++++-
 1 file changed, 482 insertions(+), 14 deletions(-)

diff --git a/src/pages/personal/pages/my-questions/index.vue b/src/pages/personal/pages/my-questions/index.vue
index 0bfaecf5a..d06761c6a 100644
--- a/src/pages/personal/pages/my-questions/index.vue
+++ b/src/pages/personal/pages/my-questions/index.vue
@@ -277,10 +277,11 @@
           <el-tabs
             class="question-tabs"
             type="border-card"
-            @tab-click="sourceClick"
+            v-model="activeType"
+            @tab-click="sourceClick2"
             style="height: 100%"
             tab-position="left">
-            <el-tab-pane label="国内标准">
+            <el-tab-pane name="INLAND" label="国内标准">
               <div v-if="!standList || standList.length === 0">
                 <div style="padding: 20px;">
                   暂无数据
@@ -291,7 +292,7 @@
                   class="question-box"
                   type="border-card"
                   v-model="activestand"
-                  @tab-click="standClick"
+                  @tab-click="standClick2"
                   style="height: 100%"
                   tab-position="left"
                 >
@@ -340,17 +341,427 @@
                 </el-tabs>
               </div>
             </el-tab-pane>
-            <el-tab-pane label="海外标准">
+            <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>
+                <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
+                          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>
+                                <template v-for="(item, index) in answerList">
+                                  <div class="clearfix">
+                                    <div class="answer-box" >
+                                      <question-item-info :answer="item"></question-item-info>
+                                    </div>
+                                  </div>
+                                </template>
+                              </div>
+                              <div class="info-answer" >
+                                <answer-item></answer-item>
+                              </div>
+                            </el-tab-pane>
+                          </template>
+                        </el-tabs>
+                      </div>
+                    </el-tab-pane>
+                  </template>
+                </el-tabs>
+              </div>
             </el-tab-pane>
-            <el-tab-pane label="企业标准">
+            <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>
+                <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
+                          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>
+                                <template v-for="(item, index) in answerList">
+                                  <div class="clearfix">
+                                    <div class="answer-box" >
+                                      <question-item-info :answer="item"></question-item-info>
+                                    </div>
+                                  </div>
+                                </template>
+                              </div>
+                              <div class="info-answer" >
+                                <answer-item></answer-item>
+                              </div>
+                            </el-tab-pane>
+                          </template>
+                        </el-tabs>
+                      </div>
+                    </el-tab-pane>
+                  </template>
+                </el-tabs>
+              </div>
             </el-tab-pane>
-            <el-tab-pane label="公共问题">
+            <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>
+                <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
+                          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>
+                                <template v-for="(item, index) in answerList">
+                                  <div class="clearfix">
+                                    <div class="answer-box" >
+                                      <question-item-info :answer="item"></question-item-info>
+                                    </div>
+                                  </div>
+                                </template>
+                              </div>
+                              <div class="info-answer" >
+                                <answer-item></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>
+        <div style="height: 100%">
+          <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>
+                <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
+                          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>
+                                <template v-for="(item, index) in answerList">
+                                  <div class="clearfix">
+                                    <div class="answer-box" >
+                                      <question-item-info :answer="item"></question-item-info>
+                                    </div>
+                                  </div>
+                                </template>
+                              </div>
+                            </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>
+                <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
+                          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>
+                                <template v-for="(item, index) in answerList">
+                                  <div class="clearfix">
+                                    <div class="answer-box" >
+                                      <question-item-info :answer="item"></question-item-info>
+                                    </div>
+                                  </div>
+                                </template>
+                              </div>
+                            </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>
+                <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
+                          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>
+                                <template v-for="(item, index) in answerList">
+                                  <div class="clearfix">
+                                    <div class="answer-box" >
+                                      <question-item-info :answer="item"></question-item-info>
+                                    </div>
+                                  </div>
+                                </template>
+                              </div>
+                            </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>
+                <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
+                          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>
+                                <template v-for="(item, index) in answerList">
+                                  <div class="clearfix">
+                                    <div class="answer-box" >
+                                      <question-item-info :answer="item"></question-item-info>
+                                    </div>
+                                  </div>
+                                </template>
+                              </div>
+                            </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>
@@ -1033,17 +1444,61 @@ export default {
       this.questionForm.classification = this.standType
     },
     handleClick(){
-      console.log(this.activeName);
-      this.ansSearch()
+      this.standList = []
+      switch (this.activeName) {
+        case 'myQue':
+          this.standSearch() // 查询提问标准
+          break
+        case 'myAns':
+          this.ansSearch() //查询回答标准
+          break
+        case 'mySub':
+          this.subSearch()  //查询订阅标准
+          break
+      }
+
     },
     sourceClick(){
       this.questionSerach.classification = this.activeType
       this.questionSerach.standardEncdoing = ''
       this.standSearch()
     },
+    sourceClick2(){
+      this.questionSerach.classification = this.activeType
+      this.ansSearch()
+    },
+    //我的订阅
+    sourceClick3(){
+      this.questionSerach.classification = this.activeType
+      this.subSearch()
+    },
     standClick(){
       this.queSearch()
     },
+    standClick2(){
+       this.$http.get('lawss/AskQuestions/getAskQuestionsByStandardId',{
+         standardId: this.activestand,
+         answerer: this.$store.getters.userInfo.userId,
+       },{
+         _this: this
+       }, res => {
+         this.questionsList = res.data
+       }, e =>{
+
+       })
+    },
+    standClick3(){
+      this.$http.get('lawss/AskQuestions/getAskQuestionsByStandardId',{
+        standardId: this.activestand,
+        answerer: this.$store.getters.userInfo.userId,
+      },{
+        _this: this
+      }, res => {
+        this.questionsList = res.data
+      }, e =>{
+
+      })
+    },
     questionClick(){
       sessionStorage.setItem('queId', this.activeQue)
        this.$http.get('lawss/AskQuestions/getAskQuestionsByakId',{
@@ -1070,25 +1525,38 @@ export default {
     queSearch(){
        this.$http.get('lawss/AskQuestions/getAskQuestionsByStandardId',{
          standardId: this.activestand,
+         answerer: this.$store.getters.userInfo.userId,
        },{
          _this: this
        }, res => {
          this.questionsList = res.data
-         console.log(this.questionsList);
        })
     },
-    //回答查询
+    //查询回答标准
     ansSearch(){
       this.$http.get('lawss/AskQuestions/getReplyDetails',{
-        classification: this.questionSerach.classification,
+        classification: this.activeType,
         answerer: this.$store.getters.userInfo.userId,
       }, {
         _this: this,
       }, res => {
-
+        this.standList = res.data
       })
     },
-    //查询标准
+    //查询订阅标准
+    subSearch(){
+       this.$http.get('lawss/AskQuestions/getAskQuestionsBySubscription',{
+         classification: this.activeType,
+         answerer: this.$store.getters.userInfo.userId,
+       },{
+         _this: this
+       }, res => {
+         this.standList = res.data
+       }, e =>{
+
+       })
+    },
+    //查询提问标准
     standSearch(){
       this.$http.get('lawss/AskQuestions/getAskQuestionsDetails',{ ...this.questionSerach },{
         _this: this

From 5fbe69b852a1e379c4d8363108d756727579f262 Mon Sep 17 00:00:00 2001
From: zyd <zhangyanduan@91isoft.com>
Date: Mon, 6 Jun 2022 15:28:35 +0800
Subject: [PATCH 07/13] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E4=BC=81?=
 =?UTF-8?q?=E6=A0=87=E9=A2=9C=E8=89=B2=E5=80=BC=E6=98=BE=E7=A4=BA=E7=BB=9F?=
 =?UTF-8?q?=E4=B8=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/EnterpriseStandardDatabase.vue                   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
index 68faaa91e..c61b5cab7 100644
--- a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
+++ b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
@@ -326,7 +326,7 @@
               <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">{{
+              <a v-if="scope.row.standStatusShow === '参考'" style="color: #98E165" @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">{{

From 1e38593880cf37af2f881579b49dfb0583bfb1d7 Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Mon, 6 Jun 2022 15:42:37 +0800
Subject: [PATCH 08/13] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=20?=
 =?UTF-8?q?=E9=A6=96=E9=A1=B5=20tab=20=E9=97=AE=E7=AD=94=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/navMenu/index.vue              |    5 +
 .../home2/components/releaseQA/index.vue      |  183 +++
 .../home2/components/releaseUs/index.vue      |    2 +-
 src/pages/home2/index.vue                     |    6 +
 .../standQA/components/answerItem.vue         |  190 +++
 .../standQA/components/questionItemInfo.vue   |   76 ++
 .../standQA/components/questions-item.vue     |   57 +
 .../standQA/components/stand-item.vue         |   53 +
 .../regulatoryRepository/standQA/index.vue    | 1185 +++++++++++++++++
 src/router/index.js                           |   11 +
 10 files changed, 1767 insertions(+), 1 deletion(-)
 create mode 100644 src/pages/home2/components/releaseQA/index.vue
 create mode 100644 src/pages/regulatoryRepository/standQA/components/answerItem.vue
 create mode 100644 src/pages/regulatoryRepository/standQA/components/questionItemInfo.vue
 create mode 100644 src/pages/regulatoryRepository/standQA/components/questions-item.vue
 create mode 100644 src/pages/regulatoryRepository/standQA/components/stand-item.vue
 create mode 100644 src/pages/regulatoryRepository/standQA/index.vue

diff --git a/src/components/navMenu/index.vue b/src/components/navMenu/index.vue
index 36144e893..3fbdc9c8b 100644
--- a/src/components/navMenu/index.vue
+++ b/src/components/navMenu/index.vue
@@ -151,6 +151,11 @@
                 path: '/standInvolveProject',
                 menuId: '8a9c87fe06244fb9d55e78fb281f625b'
               },
+              {
+                title: '问答库', // 把 标准涉及项目 这几个字 改成 标准合规评估结果
+                path: '/standQA',
+                menuId: ''
+              },
               // {
               //   title: '零部件编号申请',
               //   path: '/partCodeApply',
diff --git a/src/pages/home2/components/releaseQA/index.vue b/src/pages/home2/components/releaseQA/index.vue
new file mode 100644
index 000000000..15fbe4b0a
--- /dev/null
+++ b/src/pages/home2/components/releaseQA/index.vue
@@ -0,0 +1,183 @@
+<!-- 企标发布 -->
+<template>
+  <div class="release">
+<!--    <ul>-->
+<!--      <li v-for="item in standardReleaseList" :key="item.id" class="time-title" >-->
+<!--          <div style="height: 18px;">-->
+<!--            <a @click="handlePreview(item)" style="color: #333333" class="table-jump">{{ item.standName }}</a>-->
+<!--              <span class="time">{{item.issueTime ? $moment(item.issueTime).format('YYYY-MM-DD') : '' }}</span>-->
+<!--          </div>-->
+<!--      </li>-->
+<!--    </ul>-->
+      <el-table
+              ref="selection"
+              :data="standardReleaseList"
+              tooltip-effect="dark"
+              border
+              style="cursor:pointer;"
+              :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">
+          <el-table-column
+                  label="分类"
+                  align="center"
+                  width="80">
+          </el-table-column>
+          <el-table-column
+                  label="问题描述">
+              <template slot-scope="scope">
+<!--                  <span @click="handlePreview(scope.row)">{{ scope.row.standard }}</span>-->
+              </template>
+          </el-table-column>
+          <el-table-column
+                  prop="standName"
+                  label="提问人"
+                  width="100">
+              <template slot-scope="scope">
+<!--                  <span @click="handlePreview(scope.row)">{{ scope.row.standardName }}</span>-->
+              </template>
+          </el-table-column>
+          <el-table-column
+                  width="120"
+                  label="提问时间">
+              <template slot-scope="scope">
+<!--                  <span>{{scope.row.releaseDate ? $moment(scope.row.releaseDate).format('YYYY-MM-DD') : '' }}</span>-->
+              </template>
+          </el-table-column>
+      </el-table>
+      <div class="more" v-if="!pageVerify" @click="togo">更多 ⋙</div>
+      <loading :loading="loading">加载中...</loading>
+      <pagination
+              v-if="pageVerify"
+              style="position: static;"
+              :page="page"
+              :total="total"
+              @pageChange="pageChange"
+              @pageSizeChange="pageSizeChange"></pagination>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'ReleaseQA',
+  components: {},
+  mixins: [],
+  data() {
+    return {
+      loading: false,
+      pageVerify: false,
+      page: 1,
+      pageSize: 10,
+      total: 0,
+      putTime: '',
+      standardReleaseList: [],  //标准问答数据
+    }
+  },
+  computed: {},
+  watch: {},
+  mounted() {
+    this.getDate()
+    this.getAdvice()
+    // this.addDate()
+  },
+  methods: {
+      pageChange(page) {
+          this.page = page
+          this.pageSize = this.$store.getters.userInfo.configContent
+          this.getAdvice()
+      },
+      // 分页每页显示数改变后方法
+      pageSizeChange(pageSize) {
+          this.pageSize = this.$store.getters.userInfo.configContent
+          this.getAdvice()
+          // 此处需要调用接口，修改个人配置
+      },
+      togo () {
+          if(this.total && this.total > 10){
+              this.pageVerify = true
+              this.pageSize = this.$store.getters.userInfo.configContent
+          }else {
+              this.pageVerify = false
+          }
+          this.getAdvice()
+      },
+    // 点击查看
+    handlePreview (item) {
+        // let routeUrl = this.$router.resolve({
+        //     name: 'OtherBussStandardDetails',
+        //     params: {
+        //         id: item.standardId,
+        //         pageType: 'BUSINESS_STAND'
+        //     }
+        // })
+        // window.open(routeUrl.href, '_blank')
+    },
+    //截取时间
+    getDate (date) {
+      return date != null ? date.substring(0, date.indexOf(' ')) : ''
+    },
+    //获取数据
+    getAdvice() {
+        this.loading = true
+        // 模拟加载
+        const timer = setInterval(() => {
+            this.loading = false
+        }, 2000)
+        console.log(timer)
+        // this.$http.get("/lawss/NewsFeed/getNewsFeed", {
+        //     messageType: 'QYBZFB',
+        //     page: this.page,
+        //     pageSize: this.pageSize
+        // }, {
+        //     _this: this,loading: 'loading'
+        // }, res => {
+        //     this.standardReleaseList = res.data.records
+        //     this.total = res.data.total
+        //     this.loading = false
+        // }, e => {
+        //     this.loading = false
+        //     this.standardReleaseList = []
+        //     this.total = 0
+        // })
+    },
+  },
+
+}
+</script>
+
+<style lang="less" scoped>
+.release {
+  /deep/.el-table th > .cell {
+    font-size: 15px;
+  }
+  /deep/.el-table td > .cell{
+    font-size: 13px;
+  }
+    /deep/.more {
+        position: absolute;
+        right: 0;
+        bottom: 2px;
+        font-size: 12px;
+        float: right;
+        color: #4788c0;
+        &:hover {
+            color: #3a8ee6;
+            cursor: pointer;
+        }
+    }
+    width: 100%;
+  .time-title {
+    margin: 15px;
+    .time {
+      float: right;
+      color:#333333;
+    }
+    a {
+      color: #ffffff;
+      &:hover {
+        color: #e9c851;
+        cursor:pointer;
+        text-decoration: underline;
+      }
+    }
+  }
+}
+</style>
diff --git a/src/pages/home2/components/releaseUs/index.vue b/src/pages/home2/components/releaseUs/index.vue
index b30c59bd0..2a5308321 100644
--- a/src/pages/home2/components/releaseUs/index.vue
+++ b/src/pages/home2/components/releaseUs/index.vue
@@ -44,7 +44,7 @@
               </template>
           </el-table-column>
       </el-table>
-      <div class="more" @click="togo">更多 ⋙</div>
+      <div class="more" v-if="!pageVerify" @click="togo">更多 ⋙</div>
       <loading :loading="loading">加载中...</loading>
       <pagination
               v-if="pageVerify"
diff --git a/src/pages/home2/index.vue b/src/pages/home2/index.vue
index 1f3dfe2f7..0b507b8e3 100644
--- a/src/pages/home2/index.vue
+++ b/src/pages/home2/index.vue
@@ -27,6 +27,10 @@
                <span slot="label"><i class="el-icon-s-promotion"></i> 企业标准发布</span>
                <releaseBuss></releaseBuss>
            </el-tab-pane>
+           <el-tab-pane name="releaseQA" style="overflow-y: auto;height: 100%">
+                   <span slot="label"><i class="el-icon-chat-line-round"></i> 标准问答</span>
+                   <releaseQA></releaseQA>
+           </el-tab-pane>
            </el-tabs>
          </div>
        </div>
@@ -47,6 +51,7 @@ import searchGroup from './components/searchGroup'
 import release from './components/release'
 import releaseUs from './components/releaseUs'
 import releaseBuss from './components/releaseBuss'
+import releaseQA from './components/releaseQA'
 import solicitOpinions from './components/solicitopinions'
 import navMenu from './components/navMenu'
 import todoList from './components/todoList'
@@ -59,6 +64,7 @@ export default {
     release,
     releaseUs,
     releaseBuss,
+    releaseQA,
     navMenu,
     todoList,
     Empennage,
diff --git a/src/pages/regulatoryRepository/standQA/components/answerItem.vue b/src/pages/regulatoryRepository/standQA/components/answerItem.vue
new file mode 100644
index 000000000..2f6d9e2fc
--- /dev/null
+++ b/src/pages/regulatoryRepository/standQA/components/answerItem.vue
@@ -0,0 +1,190 @@
+<!--我的回答-->
+<template>
+  <div>
+    <el-divider style="margin: 10px 0;"></el-divider>
+    <div id="message-content">
+      <el-form ref="form" :model="form" :rules="rules">
+        <el-form-item prop="textarea">
+          <el-input
+            type="textarea"
+            :rows="2"
+            placeholder="请输入回答内容"
+            v-model="form.textarea">
+          </el-input>
+        </el-form-item>
+        <div>
+          <el-button
+            type="primary"
+            class="common-button-primary"
+            size="small"
+            style="float: right;"
+            @click="handleSubmit"
+          >提交</el-button>
+          <el-button
+            type="primary"
+            class="common-button-primary"
+            size="small"
+            style="float: right;margin-right: 10px;"
+            @click="openUploadFileDialog"
+          >上传文件</el-button>
+          <el-button
+            type="primary"
+            class="common-button-primary"
+            size="small"
+            style="float: right;"
+            @click="queArchive"
+          >问题归档</el-button>
+          <el-button
+            type="primary"
+            class="common-button-primary"
+            size="small"
+            style="float: right;margin-right: 10px;"
+            @click="invitation"
+          >邀请</el-button>
+        </div>
+      </el-form>
+    </div>
+    <el-dialog
+      width='400px'
+      :visible.sync="importModalshowflagtemp"
+      title="上传文件"
+      :footer-hide="true"
+      append-to-body
+    >
+      <el-upload
+        multiple
+        drag
+        :on-success="uploadSuccess"
+        :before-upload="beforeUpload"
+        :on-remove="removeOneFile"
+        :action="actionPath"
+        accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx, .pdf, .PDF"
+        name="file"
+        :file-list="fileList"
+        ref="importFileAboutStand">
+        <i class="el-icon-upload"></i>
+        <div class="el-upload__text">点击或拖拽上传文件</div>
+      </el-upload>
+    </el-dialog>
+    <!--    选择回答人-->
+    <Role-tree
+      is-title="选择回答人"
+      :is-visible.sync="roleFlag"
+      @checkedRole="checkedRole"
+      :nodeList="nodeList"
+    ></Role-tree>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "answerItem",
+  data(){
+   return{
+     roleFlag: false,
+     nodeList: [],
+     // 上传地址
+     actionPath: 'api/att/attFile/uploadNew',
+     importModalshowflagtemp: false,
+     fileList: [],
+     form:{
+       textarea: '',
+       invitationId: '',
+       invitationName: '',
+     },
+     rules: {
+       textarea: [
+         { required: true, message: '请输入回复内容', trigger: 'blur' },
+         { min: 1, max: 500, message: '长度在 1 到 500 个字符', trigger: 'blur' }
+       ]
+     },
+   }
+  },
+  methods:{
+    //提交
+    handleSubmit(){
+      this.form.fileList = this.fileList
+      console.log(this.form);
+    },
+    //上传文件
+    openUploadFileDialog(){
+      this.importModalshowflagtemp = true
+    },
+    //上传成功
+    uploadSuccess(res,file,fileList){
+      if(res.ok){
+        this.fileList.push(res.data)
+        this.$message.success('上传成功')
+      }else{
+        this.$message.warning(res.message)
+        fileList.pop()
+      }
+      this.importModalshowflagtemp = false
+    },
+    //文件上传前
+    beforeUpload(file){
+      console.log(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;
+    },
+    //删除文件
+    removeOneFile(){
+      this.fileList.forEach((item,index) => {
+        if(item.name === file.name || item.id === file.id){
+          this.fileList.splice(index, 1)
+        }
+      })
+    },
+    checkedRole(data){
+      let asdId = sessionStorage.getItem('queId')
+      this.$http.postData('lawss/AskUser/insertAskUser',{
+        asdId: asdId,
+        usid:  data[0].id,
+      },{
+        _this: this
+      }, res => {
+        if(res.ok){
+          this.$message.success('邀请成功')
+        }
+      }, e => {
+
+      })
+    },
+    //问题归档
+    queArchive(){
+
+    },
+    //邀请
+    invitation(){
+      this.roleFlag = true
+    },
+  },
+};
+</script>
+
+<style lang="less" scoped>
+#message-content{
+
+}
+</style>
diff --git a/src/pages/regulatoryRepository/standQA/components/questionItemInfo.vue b/src/pages/regulatoryRepository/standQA/components/questionItemInfo.vue
new file mode 100644
index 000000000..4ce7073a7
--- /dev/null
+++ b/src/pages/regulatoryRepository/standQA/components/questionItemInfo.vue
@@ -0,0 +1,76 @@
+<!--回答框-->
+<template>
+  <div id="answer-item">
+    <div>
+      <div class="row">
+        <div class="item">
+          <div>回答：
+            <span>{{answer. reply}}</span>
+          </div>
+        </div>
+      </div>
+      <div class="row">
+        <div class="item">
+          <div>附件：
+            <span style="color: #409EFF">{{answer.annex}}</span>
+          </div>
+        </div>
+      </div>
+      <div class="row" style="float: right; margin-right: 10px">
+        <div class="item">
+          <div>{{answer.answerer}}
+            <span>{{answer.replyTime}}</span>
+          </div>
+        </div>
+      </div>
+<!--      <div>-->
+<!--        <el-checkbox v-model="checked">归档</el-checkbox>-->
+<!--      </div>-->
+    </div>
+<!--    <div class="footer-box">-->
+
+<!--    </div>-->
+  </div>
+</template>
+
+<script>
+export default {
+  name: "questionItemInfo",
+  props:['answer'],
+  data(){
+    return{
+      checked: true,
+    }
+  },
+  watch:{
+    answer: {
+      immediate: true,
+      deep: true,
+      handler(val) {
+        this.answer = val
+      }
+    }
+  }
+};
+</script>
+
+<style lang="less" scoped>
+#answer-item{
+  width: 100%;
+  min-width: 130px;
+  padding: 15px 5px;
+  .row {
+    line-height: 1.8;
+  }
+  .item {
+    display: inline-block;
+  }
+  .footer-box{
+    height: 200px;
+    width: 100%;
+    position: absolute;
+    bottom: 0;
+    border-top: 1px solid #cccccc;
+  }
+}
+</style>
diff --git a/src/pages/regulatoryRepository/standQA/components/questions-item.vue b/src/pages/regulatoryRepository/standQA/components/questions-item.vue
new file mode 100644
index 000000000..660898090
--- /dev/null
+++ b/src/pages/regulatoryRepository/standQA/components/questions-item.vue
@@ -0,0 +1,57 @@
+<!--问题的描述-->
+<template>
+<div id="questions-item">
+  <div>
+    <div class="row">
+      <div class="item">
+        <div>提问：
+         <span>{{question.problemDescription}}</span>
+        </div>
+      </div>
+    </div>
+    <div class="row">
+      <div class="item">
+        <div>{{userName}}
+          <span>{{question.questionTime}}</span>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
+</template>
+
+<script>
+export default {
+  name: "questions-item",
+  props: ['question'],
+  computed: {
+  },
+  data(){
+    return{
+      userName: this.$store.getters.userInfo.userName,
+    }
+  },
+  watch:{
+    question: {
+      immediate: true,
+      deep: true,
+      handler(val){
+      }
+    }
+  }
+};
+</script>
+
+<style lang="less" scoped>
+#questions-item{
+  width: 100%;
+  min-width: 130px;
+  padding:10px 0;
+  .row {
+    line-height: 1.8;
+  }
+  .item {
+    display: inline-block;
+  }
+}
+</style>
diff --git a/src/pages/regulatoryRepository/standQA/components/stand-item.vue b/src/pages/regulatoryRepository/standQA/components/stand-item.vue
new file mode 100644
index 000000000..585498bb7
--- /dev/null
+++ b/src/pages/regulatoryRepository/standQA/components/stand-item.vue
@@ -0,0 +1,53 @@
+<!--标准的描述-->
+<template>
+  <div id="stand-item">
+    <div>
+      <div class="row">
+        <div class="item">
+          <span>{{stand.standardEncdoing}}</span>
+        </div>
+      </div>
+      <div class="row">
+        <div class="item">
+          <span>{{stand.standardName}}</span>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "stand-item",
+  props: ['stand'],
+  computed: {
+  },
+  data(){
+    return{
+    }
+  },
+  watch:{
+    stand: {
+      immediate: true,
+      deep: true,
+      handler(val) {
+        this.stand = val
+      }
+    }
+  }
+};
+</script>
+
+<style lang="less" scoped>
+#stand-item{
+  width: 100%;
+  min-width: 130px;
+  padding:10px 0;
+  .row {
+    line-height: 1.5;
+  }
+  .item {
+    display: inline-block;
+  }
+}
+</style>
diff --git a/src/pages/regulatoryRepository/standQA/index.vue b/src/pages/regulatoryRepository/standQA/index.vue
new file mode 100644
index 000000000..336f03ab5
--- /dev/null
+++ b/src/pages/regulatoryRepository/standQA/index.vue
@@ -0,0 +1,1185 @@
+<!--问答库-->
+<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="standSearch">查询</el-button>
+       </el-form-item>
+       <el-form-item>
+         <el-button size="mini"  @click="delSearch">清空</el-button>
+       </el-form-item>
+       <el-form-item>
+         <el-button size="mini" type="primary" @click="queBtn" v-if="this.activeName !=='myQue'">提问</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="sourceClick"
+      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>
+          <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
+                          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>
+                          <template v-for="(item, index) in answerList">
+                            <div class="clearfix">
+                              <div class="answer-box" >
+                                <question-item-info :answer="item"></question-item-info>
+                              </div>
+                            </div>
+                          </template>
+                        </div>
+                      </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>
+          <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
+                          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>
+                          <template v-for="(item, index) in answerList">
+                            <div class="clearfix">
+                              <div class="answer-box" >
+                                <question-item-info :answer="item"></question-item-info>
+                              </div>
+                            </div>
+                          </template>
+                        </div>
+                      </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>
+          <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
+                          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>
+                          <template v-for="(item, index) in answerList">
+                            <div class="clearfix">
+                              <div class="answer-box" >
+                                <question-item-info :answer="item"></question-item-info>
+                              </div>
+                            </div>
+                          </template>
+                        </div>
+                      </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>
+          <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
+                          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>
+                          <template v-for="(item, index) in answerList">
+                            <div class="clearfix">
+                              <div class="answer-box" >
+                                <question-item-info :answer="item"></question-item-info>
+                              </div>
+                            </div>
+                          </template>
+                        </div>
+                      </el-tab-pane>
+                    </template>
+                  </el-tabs>
+                </div>
+              </el-tab-pane>
+            </template>
+          </el-tabs>
+        </div>
+      </el-tab-pane>
+    </el-tabs>
+  </div>
+  <!--提问弹窗  -->
+  <el-dialog
+    title="提交问题"
+    :visible.sync="dialogVisible"
+    width="600px"
+    :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>
+          <el-button size="mini" style="margin-left: 30px;" type="primary" @click="addList">选择标准</el-button>
+        </el-form-item>
+        <el-form-item label="问题" prop="problemDescription"  class="serch-form-item">
+          <el-input v-model="questionForm.problemDescription"></el-input>
+        </el-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;">
+
+    </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" @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"
+            @change="lawNumberSearch"
+            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] === '废止' || 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] === '废止' || 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] === '废止' || 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] === '废止' || 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] === '废止' || 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] === '废止' || 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] === '废止' || 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] === '废止' || 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] === '废止' || 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] === '废止' || 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] === '废止' || 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] === '废止' || 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] === '废止' || 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] === '废止' || 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>
+</div>
+</template>
+
+<script>
+import questionsItem from './components/questions-item'
+import answerItem from "./components/answerItem";
+import questionItemInfo from "./components/questionItemInfo";
+import standItem from './components/stand-item'
+
+export default {
+  name: "standQA",
+  components:{
+    questionItemInfo,
+    questionsItem,
+    answerItem,
+    standItem
+  },
+  data(){
+    return{
+      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: '',
+      standType: 'INLAND',
+      dialogVisible: false,
+      questionForm:{
+        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: [],
+    }
+  },
+  mounted(){
+    this.standSearch()
+    // 查询各下拉框数据
+    this.$http.get("sys/dictype/getDicTypeListCode", "", {
+      _this: this,
+      loading: "loading"
+    }, res => {
+      this.setMap(res.data.WBZTCLASS);// 文本状态
+      this.textState = res.data.WBZTCLASS // 文本状态
+    }, e => {
+    });
+  },
+  methods:{
+    // 点击查看
+    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.dataSource = 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.standardId = this.handleSelectTableList[0].id
+        this.standModel = false
+      }else{
+        this.$message.warning('请选择一条数据进行添加')
+      }
+    },
+    //选择标准的查询按钮
+    searchLawBtn(){
+      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(){
+      console.log(this.activeName);
+      this.ansSearch()
+    },
+    sourceClick(){
+      this.questionSerach.classification = this.activeType
+      this.questionSerach.standardEncdoing = ''
+      this.standSearch()
+    },
+    standClick(){
+      this.queSearch()
+    },
+    questionClick(){
+      sessionStorage.setItem('queId', this.activeQue)
+       this.$http.get('lawss/AskQuestions/getAskQuestionsByakId',{
+         id: this.activeQue
+       },{
+         _this: this
+       }, res => {
+         this.answerList = res.data
+       }, e => {
+       })
+    },
+    //提问按钮
+    queBtn(){
+      this.dialogVisible = true
+    },
+    handleClose(){
+       this.dialogVisible = false
+    },
+    //清空
+    delSearch(){
+
+    },
+    //问题查询
+    queSearch(){
+       this.$http.get('lawss/AskQuestions/getAskQuestionsByStandardId',{
+         standardId: this.activestand,
+       },{
+         _this: this
+       }, res => {
+         this.questionsList = res.data
+         console.log(this.questionsList);
+       })
+    },
+    //回答查询
+    ansSearch(){
+      this.$http.get('lawss/AskQuestions/getReplyDetails',{
+        classification: this.questionSerach.classification,
+        answerer: this.$store.getters.userInfo.userId,
+      }, {
+        _this: this,
+      }, res => {
+
+      })
+    },
+    //查询标准
+    standSearch(){
+      this.$http.get('lawss/AskQuestions/getAskQuestionsDetails',{ ...this.questionSerach },{
+        _this: this
+      }, res =>{
+        this.standList = res.data
+      }, e => {
+
+      })
+    },
+    //文件上传前
+    beforeUploadTheme(file){
+      console.log(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.questionForm.standardId){
+        this.questionForm.fileList = this.fileList
+        console.log(this.questionForm);
+        this.$refs['queForm'].validate((valid) => {
+          if(valid){
+            this.$http.postData('lawss/AskQuestions/insertAskQuestions',{ ...this.questionForm },
+              {
+                _this: this
+              }, res => {
+                console.log(res);
+              }, e => {
+
+              })
+          }else{
+            return this.$message.warning('请输入问题')
+          }
+        })
+      }else{
+        this.$message.warning('请选择至少一条标准')
+      }
+    },
+  },
+};
+</script>
+
+<style lang="less" scoped>
+#my-questions{
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  background: #F5F7FA;
+  margin-bottom: 10px;
+  .tab-box{
+    height: 100%;
+  }
+  .type-tabs {
+    /deep/.el-tabs__header {
+      margin-right: 0;
+    }
+    /deep/.el-tabs__content {
+      padding: 0;
+      .el-tab-pane {
+        height: 100%;
+      }
+    }
+  }
+  .question-box{
+
+  }
+  .question-tabs {
+    height: 100%;
+    border-top: none;
+    border-bottom: none;
+    /deep/.el-tabs__nav {
+      height: calc(~'100% - 50px');
+      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;
+}
+.answer-box{
+  height: auto;
+  width: auto;
+  background: #F5F7FA;
+  float: right;
+  margin: 20px 10px 0 80px;
+}
+.info-answer{
+  height: 200px;
+  width: 100%;
+  position: absolute;
+  bottom: 0;
+  //border-top: 1px solid #cccccc;
+}
+/deep/.el-upload-dragger{
+  width: 450px !important;
+}
+.el-input{
+  width: 90%;
+}
+/deep/.el-dialog__body{
+  padding: 10px;
+}
+ /deep/.el-upload-dragger {
+  height: 90px;
+}
+</style>
diff --git a/src/router/index.js b/src/router/index.js
index 3610e796e..eda37baad 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -3304,6 +3304,17 @@ const routes = [
           menuId: 'JURHS3LVP35US88ABULS'
         }
       },
+      {
+        path: '/standQA',
+        name: 'StandQA',
+        component: () =>
+            import('@/pages/regulatoryRepository/standQA'),
+        meta: {
+          requireAuth: true,
+          title: '问答库', // 把 标准涉及项目 这几个字 改成 标准合规评估结果
+          menuId: ''
+        }
+      },
       // 本地产品/项目库详情页
       {
         path: '/localProductDetail',

From 84a6ffafc092c4c1dd7ae5de7afe05308dc5ce96 Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Mon, 6 Jun 2022 16:08:06 +0800
Subject: [PATCH 09/13] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=20?=
 =?UTF-8?q?=E9=97=AE=E7=AD=94=E5=BA=93=20=E5=89=8D=E7=AB=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/regulatoryRepository/standQA/index.vue | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/pages/regulatoryRepository/standQA/index.vue b/src/pages/regulatoryRepository/standQA/index.vue
index 336f03ab5..5b9c4f4c1 100644
--- a/src/pages/regulatoryRepository/standQA/index.vue
+++ b/src/pages/regulatoryRepository/standQA/index.vue
@@ -266,7 +266,7 @@
   <el-dialog
     title="提交问题"
     :visible.sync="dialogVisible"
-    width="600px"
+    width="650px"
     :before-close="handleClose">
     <div>
       <el-form ref="queForm" :rules="queRules" class="label-input-form" label-width="80px" :model="questionForm">
@@ -277,7 +277,15 @@
             <el-radio  label="BUSINESS_STAND">企业标准</el-radio>
             <el-radio  label="OTHER">公共</el-radio>
           </el-radio-group>
-          <el-button size="mini" style="margin-left: 30px;" type="primary" @click="addList">选择标准</el-button>
+          <el-button size="mini" v-if="standType !== 'OTHER'" style="margin-left: 30px;" type="primary" @click="addList">选择标准</el-button>
+          <el-select v-if="standType === 'OTHER'" v-model="questionForm.publicType" filterable clearable placeholder="请选择公共" style="margin-left: 30px;appearance: none">
+            <el-option
+                    v-for="(item, index) in DYGGWT"
+                    :key="index"
+                    :value="item.value"
+                    :label="item.label"
+            ></el-option>
+          </el-select>
         </el-form-item>
         <el-form-item label="问题" prop="problemDescription"  class="serch-form-item">
           <el-input v-model="questionForm.problemDescription"></el-input>
@@ -719,6 +727,7 @@ export default {
       },
       textStatusMap: {},// 文本状态id与name对应
       textState: [],
+      DYGGWT: [],
       standModel: false,
       lawInfoTableLoading: true,
       handleSelectTableList: [],
@@ -740,6 +749,7 @@ export default {
         standardName: '',   //标准名称
         standardId:'',   //标准id
         fileList: '',
+        publicType: '',
       },
       queRules:{
         problemDescription: [
@@ -767,6 +777,7 @@ export default {
     }, res => {
       this.setMap(res.data.WBZTCLASS);// 文本状态
       this.textState = res.data.WBZTCLASS // 文本状态
+      this.DYGGWT = res.data.DYGGWT // 问答公共问题
     }, e => {
     });
   },
@@ -1074,7 +1085,6 @@ export default {
     queSubmit(){
       if(this.questionForm.standardId){
         this.questionForm.fileList = this.fileList
-        console.log(this.questionForm);
         this.$refs['queForm'].validate((valid) => {
           if(valid){
             this.$http.postData('lawss/AskQuestions/insertAskQuestions',{ ...this.questionForm },

From bd8ce07047f80072026718245e26836c25f7227a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Mon, 6 Jun 2022 17:32:12 +0800
Subject: [PATCH 10/13] =?UTF-8?q?=E6=88=91=E7=9A=84=E9=97=AE=E7=AD=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../my-questions/components/answerItem.vue    | 24 +++++++----
 .../components/questionItemInfo.vue           | 16 +++++---
 .../personal/pages/my-questions/index.vue     | 41 +++++++++++++++++--
 3 files changed, 63 insertions(+), 18 deletions(-)

diff --git a/src/pages/personal/pages/my-questions/components/answerItem.vue b/src/pages/personal/pages/my-questions/components/answerItem.vue
index 2f6d9e2fc..5d5e90a5a 100644
--- a/src/pages/personal/pages/my-questions/components/answerItem.vue
+++ b/src/pages/personal/pages/my-questions/components/answerItem.vue
@@ -4,12 +4,12 @@
     <el-divider style="margin: 10px 0;"></el-divider>
     <div id="message-content">
       <el-form ref="form" :model="form" :rules="rules">
-        <el-form-item prop="textarea">
+        <el-form-item prop="reply">
           <el-input
             type="textarea"
             :rows="2"
             placeholder="请输入回答内容"
-            v-model="form.textarea">
+            v-model="form.reply">
           </el-input>
         </el-form-item>
         <div>
@@ -88,12 +88,11 @@ export default {
      importModalshowflagtemp: false,
      fileList: [],
      form:{
-       textarea: '',
-       invitationId: '',
-       invitationName: '',
+       reply: '',
+       answerer: this.$store.getters.userInfo.userId,
      },
      rules: {
-       textarea: [
+       reply: [
          { required: true, message: '请输入回复内容', trigger: 'blur' },
          { min: 1, max: 500, message: '长度在 1 到 500 个字符', trigger: 'blur' }
        ]
@@ -103,8 +102,16 @@ export default {
   methods:{
     //提交
     handleSubmit(){
+      let asdId = sessionStorage.getItem('queId')
       this.form.fileList = this.fileList
-      console.log(this.form);
+      this.form.askId = asdId
+      this.$http.postData('lawss/Reply/insertReply',{ ...this.form },{
+        _this: this
+      }, res => {
+
+      }, e => {
+
+      })
     },
     //上传文件
     openUploadFileDialog(){
@@ -173,7 +180,8 @@ export default {
     },
     //问题归档
     queArchive(){
-
+      let mergeList = JSON.parse(sessionStorage.getItem('mergeList'))
+      console.log(mergeList);
     },
     //邀请
     invitation(){
diff --git a/src/pages/personal/pages/my-questions/components/questionItemInfo.vue b/src/pages/personal/pages/my-questions/components/questionItemInfo.vue
index 4ce7073a7..cc88ae26f 100644
--- a/src/pages/personal/pages/my-questions/components/questionItemInfo.vue
+++ b/src/pages/personal/pages/my-questions/components/questionItemInfo.vue
@@ -11,8 +11,8 @@
       </div>
       <div class="row">
         <div class="item">
-          <div>附件：
-            <span style="color: #409EFF">{{answer.annex}}</span>
+          <div style="cursor: pointer;">附件：
+            <span style="color: #409EFF">{{answer.appendixName}}</span>
           </div>
         </div>
       </div>
@@ -23,9 +23,9 @@
           </div>
         </div>
       </div>
-<!--      <div>-->
-<!--        <el-checkbox v-model="checked">归档</el-checkbox>-->
-<!--      </div>-->
+      <div>
+        <el-checkbox @change="answerChang" v-model="answer.checked">归档</el-checkbox>
+      </div>
     </div>
 <!--    <div class="footer-box">-->
 
@@ -39,9 +39,13 @@ export default {
   props:['answer'],
   data(){
     return{
-      checked: true,
+      checked: '',
     }
   },
+  methods:{
+    answerChang(val){
+    },
+  },
   watch:{
     answer: {
       immediate: true,
diff --git a/src/pages/personal/pages/my-questions/index.vue b/src/pages/personal/pages/my-questions/index.vue
index d06761c6a..6ab4f5065 100644
--- a/src/pages/personal/pages/my-questions/index.vue
+++ b/src/pages/personal/pages/my-questions/index.vue
@@ -770,7 +770,7 @@
   <el-dialog
     title="提交问题"
     :visible.sync="dialogVisible"
-    width="600px"
+    width="650px"
     :before-close="handleClose">
     <div>
       <el-form ref="queForm" :rules="queRules" class="label-input-form" label-width="80px" :model="questionForm">
@@ -781,7 +781,17 @@
             <el-radio  label="BUSINESS_STAND">企业标准</el-radio>
             <el-radio  label="OTHER">公共</el-radio>
           </el-radio-group>
-          <el-button size="mini" style="margin-left: 30px;" type="primary" @click="addList">选择标准</el-button>
+          <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="问题" prop="problemDescription"  class="serch-form-item">
           <el-input v-model="questionForm.problemDescription"></el-input>
@@ -1202,6 +1212,7 @@ export default {
   },
   data(){
     return{
+      mergeList: [],
       handleSelectForm: {
         standName: '', //标准名称
         numberName: '', //政策名称
@@ -1234,9 +1245,11 @@ export default {
       activeType: 'INLAND',
       activestand: '',
       activeQue: '',
+      pubOptions: [], //公共问题
       standType: 'INLAND',
       dialogVisible: false,
       questionForm:{
+        pubQue: '', //公共问题
         classification: 'INLAND', //标准类型
         problemDescription: '', //问题
         questioner: this.$store.getters.userInfo.userId, //提问人
@@ -1271,9 +1284,25 @@ export default {
     }, 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.mergeList = []
+        val.forEach(item =>{
+          if(item.checked){
+            this.mergeList.push(item.id)
+          }
+        })
+        sessionStorage.setItem('mergeList', JSON.stringify(this.mergeList))
+      }
+    }
+  },
   methods:{
     // 点击查看
     handlePreview(item) {
@@ -1488,7 +1517,7 @@ export default {
        })
     },
     standClick3(){
-      this.$http.get('lawss/AskQuestions/getAskQuestionsByStandardId',{
+      this.$http.get('lawss/AskQuestions/getSubscriptionByStandId',{
         standardId: this.activestand,
         answerer: this.$store.getters.userInfo.userId,
       },{
@@ -1633,9 +1662,13 @@ export default {
     },
     //提交问题
     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.questionForm.fileList = this.fileList
-        console.log(this.questionForm);
         this.$refs['queForm'].validate((valid) => {
           if(valid){
             this.$http.postData('lawss/AskQuestions/insertAskQuestions',{ ...this.questionForm },

From 1aed87142c30a7dcb9c904b95ae8704270e066a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Mon, 6 Jun 2022 17:54:57 +0800
Subject: [PATCH 11/13] =?UTF-8?q?=E6=88=91=E7=9A=84=E9=97=AE=E7=AD=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/my-questions/components/answerItem.vue   | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/pages/personal/pages/my-questions/components/answerItem.vue b/src/pages/personal/pages/my-questions/components/answerItem.vue
index 5d5e90a5a..7855ce2a4 100644
--- a/src/pages/personal/pages/my-questions/components/answerItem.vue
+++ b/src/pages/personal/pages/my-questions/components/answerItem.vue
@@ -180,8 +180,20 @@ export default {
     },
     //问题归档
     queArchive(){
+      let list = []
       let mergeList = JSON.parse(sessionStorage.getItem('mergeList'))
-      console.log(mergeList);
+      for (let i = 0; i < mergeList.length; i++) {
+        list.push(mergeList[i])
+      }
+      let listId = list.join(',')
+      this.$http.post('lawss/Reply/updateReply', {
+         id: listId,
+      },{
+        _this: this
+      }, res => {
+      }, e => {
+
+      })
     },
     //邀请
     invitation(){

From 459edea98696fad8a14d66326b564f2ae62654d6 Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Mon, 6 Jun 2022 18:12:28 +0800
Subject: [PATCH 12/13] feat: There is no way the,

---
 src/pages/searchCenter/pages/standardSearch.vue | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/pages/searchCenter/pages/standardSearch.vue b/src/pages/searchCenter/pages/standardSearch.vue
index 74a5a45ff..f9e76fc3c 100644
--- a/src/pages/searchCenter/pages/standardSearch.vue
+++ b/src/pages/searchCenter/pages/standardSearch.vue
@@ -2740,18 +2740,28 @@
 <style lang="less" scoped>
     @import '~@/assets/styles/mixins';
     @import '~@/assets/styles/style';
+    /deep/ .yellowEsClass{
+        background-color: #E6A23C !important;
+    }
+
+    /deep/ .redEsClass{
+        background-color: #F56C6C !important;
+    }
     /deep/ .yellowClass{
-        color: #E6A23C;
+        color: #E6A23C !important;
     }
 
     /deep/ .redClass{
-        color: #F56C6C;
+        color: #F56C6C !important;
     }
     /deep/ p{
         display: inline;
     }
+    /deep/.highlight-Es-class {
+        background-color: #3391ce !important;
+    }
     /deep/.highlight-class {
-        color: red !important;
+        color: #3391ce !important;
     }
     /deep/.pagination{
         position: static !important;

From d3e84e81103e778432a84a3d96004dbd1473ba99 Mon Sep 17 00:00:00 2001
From: zyd <zhangyanduan@91isoft.com>
Date: Mon, 6 Jun 2022 23:43:38 +0800
Subject: [PATCH 13/13] =?UTF-8?q?fix:=20=E9=A6=96=E9=A1=B5=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2=E6=8C=89=E9=92=AE=E6=95=88=E6=9E=9C=E5=8F=98=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../home2/components/searchGroup/index.vue    | 30 +++++--------------
 1 file changed, 8 insertions(+), 22 deletions(-)

diff --git a/src/pages/home2/components/searchGroup/index.vue b/src/pages/home2/components/searchGroup/index.vue
index 4c1023c35..1b2c2761a 100644
--- a/src/pages/home2/components/searchGroup/index.vue
+++ b/src/pages/home2/components/searchGroup/index.vue
@@ -14,21 +14,6 @@
         :value="item.value"
       ></el-option>
     </el-select>
-
-    <el-select
-            v-model="checkStateType"
-            class="search-group-itemType"
-            placeholder="请选择"
-            @change="checkStateTypeFunc"
-    >
-      <el-option
-              v-for="item in jumpPageType"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-      ></el-option>
-    </el-select>
-
     <div class="search-condition">
       <el-input
         @keyup.native.enter="search"
@@ -37,7 +22,8 @@
         placeholder="请输入关键词"
         clearable
       ></el-input>
-      <el-button style="box-shadow:1px 1px 10px rgba(0,0,0,0.2);margin-left: 5px;font-size: 15px;" type="primary" @click="search">一般检索</el-button>
+      <el-button style="box-shadow:1px 1px 5px rgba(0,0,0,0.2);margin-left: 5px;font-size: 15px;" type="primary" @click="search('titleSearch')">一般检索(标题)</el-button>
+      <el-button style="box-shadow:1px 1px 50px rgba(0,0,0,0.2);margin-left: 5px;font-size: 15px;" type="primary" @click="search('allTextSearch')">一般检索(全文)</el-button>
       <el-button style="box-shadow:1px 1px 10px rgba(0,0,0,0.2);margin-left: 5px;font-size: 15px;" type="primary" @click="seniorSearch">高级检索</el-button>
     </div>
   </div>
@@ -93,10 +79,10 @@ export default {
   computed: {},
   watch: {},
   methods: {
-    checkStateTypeFunc(data){
-     this.checkStateType = data
-     this.$forceUpdate()
-    },
+    // checkStateTypeFunc(data){
+    //  this.checkStateType = data
+    //  this.$forceUpdate()
+    // },
     checkStateFunc(data){
           if(data === 'All'){
             this.showType = true
@@ -104,13 +90,13 @@ export default {
             this.showType = false
           }
     },
-    search() {
+    search(checkStateType) {
       this.$router.push({
         name: 'StandardSearch',
         params: {
           selectKey: this.checkState,
           searchValue: this.checkContent || undefined,
-          allType: this.checkStateType,
+          allType: checkStateType,
         }
       })
     },