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

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

@@ -136,7 +136,7 @@ export default {
         this.$message.warning(res.message)
         fileList.pop()
       }
-      this.importModalshowflagtemp = false
+      // this.importModalshowflagtemp = false
     },
     //文件上传前
     beforeUpload(file){
@@ -192,6 +192,7 @@ export default {
         }, res => {
           if(res.respCode === '200'){
             this.$emit('emitInsState',true)
+            this.$message.success('归档成功')
           }
         }, e => {
         })

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

@@ -12,7 +12,9 @@
       <div class="row">
         <div class="item" @click="clickButtonTo">
           <div style="cursor: pointer;">附件：
-            <span style="color: #409EFF">{{answer.appendixName}}</span>
+            <div v-if="fileList.length > 0" 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>
         </div>
       </div>
@@ -42,16 +44,33 @@ export default {
       checked: '',
       answererNowUserId: this.$store.getters.userInfo.userId,
       answererNowUserName: this.$store.getters.userInfo.userName,
+      fileList:[],
     }
   },
   methods:{
+    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;
+    },
     //点击预览
-    clickButtonTo() {
+    clickButtonTo(attId) {
-      const attId = this.answer.appendixId
+      // 过滤
-      this.$preview(attId)
+      if(attId.indexOf("ATT_FILE") !== -1){
+        this.$preview(attId)
+      }
     },
     answerChang(){}
   },
+  mounted () {
+    this.fileList = this.assemble(this.answer.appendixId,this.answer.appendixName)
+  },
   watch:{
     answer: {
       immediate: true,
@@ -65,6 +84,9 @@ export default {
 </script>
 
 <style lang="less" scoped>
+  /deep/ .fileClass{
+    line-height: 22px !important;
+  }
 #answer-item{
   width: 100%;
   min-width: 130px;

src/pages/regulatoryRepository/standQA/index.vue

@@ -1084,8 +1084,9 @@ export default {
     },
     //问题查询
     queSearch(){
-       this.$http.get('lawss/AskQuestions/getAskQuestionsByStandardId',{
+       this.$http.get('lawss/AskQuestions/getAskQuestionsNew',{
          standardId: this.activestand,
+         classification: this.activeName,
        },{
          _this: this
        }, res => {

src/sysConfig/index.js

@@ -8,8 +8,8 @@
 // const devInterfacePORT = '10005'
 // const devIp = '192.168.1.42'
 // const devInterfacePORT = '9999'
-const devIp = '39.98.140.126'
+const devIp = '192.168.0.109'
-const devInterfacePORT = '4201'
+const devInterfacePORT = '9999'
 // const devIp = '62.234.136.153'
 // const devInterfacePORT = '8033'
 // 配置 idm 认证