From 7dfe95a1aadeaacd5daaf82b455dca74869adbc6 Mon Sep 17 00:00:00 2001
From: "396572590@qq.com" <liuchao>
Date: Wed, 3 Aug 2022 15:36:06 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=20?=
 =?UTF-8?q?=E2=80=8556725=20=E6=88=91=E7=9A=84=E8=AE=A2=E9=98=85=EF=BC=8C?=
 =?UTF-8?q?=E5=A4=9A=E4=BD=99=E9=99=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/questionItemInfo.vue           | 10 ++-
 .../personal/pages/my-questions/index.vue     | 64 +++++++++++++------
 2 files changed, 53 insertions(+), 21 deletions(-)

diff --git a/src/pages/personal/pages/my-questions/components/questionItemInfo.vue b/src/pages/personal/pages/my-questions/components/questionItemInfo.vue
index 408da7b5c..2db8bdde9 100644
--- a/src/pages/personal/pages/my-questions/components/questionItemInfo.vue
+++ b/src/pages/personal/pages/my-questions/components/questionItemInfo.vue
@@ -12,7 +12,7 @@
       <div class="row">
         <div class="item" @click="clickButtonTo">
           <div style="cursor: pointer;">附件：
-            <div v-if="fileList.length > 0" v-for="(item,index) in fileList" :key="index" style="color: #409eff;cursor:pointer;margin-left: 40px;" class="fileClass">
+            <div v-for="(item,index) in fileList" :key="index" style="color: #409eff;cursor:pointer;margin-left: 40px;" class="fileClass">
               <span style="" @click="clickButtonTo(item.id)" :title="item.name"> {{ item.name  }}</span>
             </div>
           </div>
@@ -43,6 +43,10 @@ export default {
       type: Object,
       required: false
     },
+    fileList: {
+      type: Array,
+      required: false
+    },
     questionerForm: {
       type: Object,
       required: false
@@ -58,6 +62,9 @@ export default {
     }
   },
   methods:{
+    fileListSetFunc(){
+      return this.assemble(this.answer.appendixId,this.answer.appendixName)
+    },
     archiveVerify(){
       return !!(this.questionerForm && this.questionerForm.questioner && this.questionerForm.questioner !== this.answererNowUserName
               && this.institutionId === '30001273');
@@ -83,7 +90,6 @@ export default {
     answerChang(){}
   },
   mounted () {
-    this.fileList = this.assemble(this.answer.appendixId,this.answer.appendixName)
   },
   watch:{
     answer: {
diff --git a/src/pages/personal/pages/my-questions/index.vue b/src/pages/personal/pages/my-questions/index.vue
index 25d27956b..95b52d63e 100644
--- a/src/pages/personal/pages/my-questions/index.vue
+++ b/src/pages/personal/pages/my-questions/index.vue
@@ -68,6 +68,7 @@
                       </div>
                       <div style="height: 100%" v-else>
                         <el-tabs
+                          v-loading="tagsLoading"
                           class="question-box"
                           type="border-card"
                           style="height: 100%"
@@ -84,7 +85,7 @@
                                 <template v-for="(item, index) in answerList">
                                   <div class="clearfix">
                                     <div class="answer-box" >
-                                      <question-item-info :answer="item"></question-item-info>
+                                      <question-item-info :answer="item" :fileList="fileListSetFunc(item)"></question-item-info>
                                     </div>
                                   </div>
                                 </template>
@@ -126,6 +127,7 @@
                       </div>
                       <div style="height: 100%" v-else>
                         <el-tabs
+                          v-loading="tagsLoading"
                           class="question-box"
                           type="border-card"
                           style="height: 100%"
@@ -142,7 +144,7 @@
                                 <template v-for="(item, index) in answerList">
                                   <div class="clearfix">
                                     <div class="answer-box" >
-                                      <question-item-info :answer="item"></question-item-info>
+                                      <question-item-info :answer="item" :fileList="fileListSetFunc(item)"></question-item-info>
                                     </div>
                                   </div>
                                 </template>
@@ -184,6 +186,7 @@
                       </div>
                       <div style="height: 100%" v-else>
                         <el-tabs
+                          v-loading="tagsLoading"
                           class="question-box"
                           type="border-card"
                           style="height: 100%"
@@ -200,7 +203,7 @@
                                 <template v-for="(item, index) in answerList">
                                   <div class="clearfix">
                                     <div class="answer-box" >
-                                      <question-item-info :answer="item"></question-item-info>
+                                      <question-item-info :answer="item" :fileList="fileListSetFunc(item)"></question-item-info>
                                     </div>
                                   </div>
                                 </template>
@@ -242,6 +245,7 @@
                       </div>
                       <div style="height: 100%" v-else>
                         <el-tabs
+                                v-loading="tagsLoading"
                           class="question-box"
                           type="border-card"
                           style="height: 100%"
@@ -258,7 +262,7 @@
                                 <template v-for="(item, index) in answerList">
                                   <div class="clearfix">
                                     <div class="answer-box" >
-                                      <question-item-info :answer="item"></question-item-info>
+                                      <question-item-info :answer="item" :fileList="fileListSetFunc(item)"></question-item-info>
                                     </div>
                                   </div>
                                 </template>
@@ -311,7 +315,7 @@
                         </div>
                       </div>
                       <div style="height: 100%" v-else>
-                        <el-tabs
+                        <el-tabs v-loading="tagsLoading"
                           class="question-box"
                           type="border-card"
                           v-model="activeQue"
@@ -374,7 +378,7 @@
                         </div>
                       </div>
                       <div style="height: 100%" v-else>
-                        <el-tabs
+                        <el-tabs v-loading="tagsLoading"
                           class="question-box"
                           type="border-card"
                           v-model="activeQue"
@@ -437,7 +441,7 @@
                         </div>
                       </div>
                       <div style="height: 100%" v-else>
-                        <el-tabs
+                        <el-tabs v-loading="tagsLoading"
                           class="question-box"
                           type="border-card"
                           v-model="activeQue"
@@ -500,7 +504,7 @@
                         </div>
                       </div>
                       <div style="height: 100%" v-else>
-                        <el-tabs
+                        <el-tabs v-loading="tagsLoading"
                           class="question-box"
                           type="border-card"
                           v-model="activeQue"
@@ -577,7 +581,7 @@
                         </div>
                       </div>
                       <div style="height: 100%" v-else>
-                        <el-tabs
+                        <el-tabs v-loading="tagsLoading"
                           class="question-box"
                           type="border-card"
                           style="height: 100%"
@@ -594,7 +598,7 @@
                                 <template v-for="(item, index) in answerList">
                                   <div class="clearfix">
                                     <div class="answer-box" >
-                                      <question-item-info :answer="item"></question-item-info>
+                                      <question-item-info :answer="item" :fileList="fileListSetFunc(item)"></question-item-info>
                                     </div>
                                   </div>
                                 </template>
@@ -635,7 +639,7 @@
                         </div>
                       </div>
                       <div style="height: 100%" v-else>
-                        <el-tabs
+                        <el-tabs v-loading="tagsLoading"
                           class="question-box"
                           type="border-card"
                           style="height: 100%"
@@ -652,7 +656,7 @@
                                 <template v-for="(item, index) in answerList">
                                   <div class="clearfix">
                                     <div class="answer-box" >
-                                      <question-item-info :answer="item"></question-item-info>
+                                      <question-item-info :answer="item" :fileList="fileListSetFunc(item)"></question-item-info>
                                     </div>
                                   </div>
                                 </template>
@@ -693,7 +697,7 @@
                         </div>
                       </div>
                       <div style="height: 100%" v-else>
-                        <el-tabs
+                        <el-tabs v-loading="tagsLoading"
                           class="question-box"
                           type="border-card"
                           style="height: 100%"
@@ -710,7 +714,7 @@
                                 <template v-for="(item, index) in answerList">
                                   <div class="clearfix">
                                     <div class="answer-box" >
-                                      <question-item-info :answer="item"></question-item-info>
+                                      <question-item-info :answer="item" :fileList="fileListSetFunc(item)"></question-item-info>
                                     </div>
                                   </div>
                                 </template>
@@ -751,7 +755,7 @@
                         </div>
                       </div>
                       <div style="height: 100%" v-else>
-                        <el-tabs
+                        <el-tabs v-loading="tagsLoading"
                           class="question-box"
                           type="border-card"
                           style="height: 100%"
@@ -768,7 +772,7 @@
                                 <template v-for="(item, index) in answerList">
                                   <div class="clearfix">
                                     <div class="answer-box" >
-                                      <question-item-info :answer="item"></question-item-info>
+                                      <question-item-info :answer="item" :fileList="fileListSetFunc(item)"></question-item-info>
                                     </div>
                                   </div>
                                 </template>
@@ -846,7 +850,7 @@
     </div>
     <span slot="footer" class="dialog-footer">
     <el-button class="common-button-default" size="mini" @click="dialogVisible = false">取 消</el-button>
-    <el-button class="common-button-primary" size="mini" type="primary":loading="submitBtnLoading" @click="queSubmit">提 交</el-button>
+    <el-button class="common-button-primary" size="mini" type="primary" :loading="submitBtnLoading" @click="queSubmit">提 交</el-button>
     </span>
   </el-dialog>
   <!--    选择标准抽屉-->
@@ -1253,6 +1257,7 @@ export default {
   },
   data(){
     return{
+      tagsLoading: false,
       submitBtnLoading: false,
       aiKey:1,
       qiiKey:1,
@@ -1326,7 +1331,6 @@ export default {
     }
   },
   mounted(){
-    console.log(this.$store.getters.userInfo)
     this.standSearch()
     // 查询各下拉框数据
     this.$http.get("sys/dictype/getDicTypeListCode", "", {
@@ -1621,9 +1625,11 @@ export default {
       this.subSearch()
     },
     standClick(){
+      this.tagsLoading = true
       this.queSearch()
     },
     standClick2(){
+       this.tagsLoading = true
        this.$http.get('lawss/AskQuestions/getAskQuestionsByStandardId',{
          standardId: this.activestand,
          answerer: this.$store.getters.userInfo.userId,
@@ -1631,11 +1637,13 @@ export default {
          _this: this
        }, res => {
          this.questionsList = res.data
+         this.tagsLoading = false
        }, e =>{
 
        })
     },
     standClick3(){
+      this.tagsLoading = true
       this.$http.get('lawss/AskQuestions/getSubscriptionByStandId',{
         standardId: this.activestand,
         answerer: this.$store.getters.userInfo.userId,
@@ -1643,6 +1651,7 @@ export default {
         _this: this
       }, res => {
         this.questionsList = res.data
+        this.tagsLoading = false
       }, e =>{
 
       })
@@ -1668,14 +1677,31 @@ export default {
               })
             }
            this.answerList = res.data
+           this.answerList.fileList = this.assemble(this.answerList.appendixId,this.answerList.appendixName)
          }else{
            this.answerList = res.data
+           this.answerList.fileList = this.assemble(this.answerList.appendixId,this.answerList.appendixName)
          }
          this.qiiKey++
          this.dataLoading = false
+         this.tagsLoading = false
        }, e => {
        })
     },
+    fileListSetFunc(item){
+      return this.assemble(item.appendixId,item.appendixName)
+    },
+    assemble(ids,names){
+      let list= [];
+      if(ids && ids !== '' && names && names !== ''){
+        let idArray=ids.split(',');
+        let nameArray=names.split(',');
+        for(let i=0; i<idArray.length; i++){
+          list.push({id:idArray[i],name:nameArray[i]});
+        }
+      }
+      return list;
+    },
     //提问按钮
     queBtn(){
       this.fileList = []
@@ -1761,6 +1787,7 @@ export default {
          _this: this
        }, res => {
          this.questionsList = res.data
+         this.tagsLoading = false
        })
     },
     //查询回答标准
@@ -1805,7 +1832,6 @@ export default {
     },
     //文件上传前
     beforeUploadTheme(file){
-      console.log(file);
       var filename = file.name;
       var index1 = filename.lastIndexOf('.')
       var index2 = filename.length