合并分支 'dev_20230216' 到 'master'

Dev 20230216

查看合并请求 laws-foton-slrs/foton-laws-system-front!46

src/pages/details/otherStandardDetails/index.vue

@@ -2270,8 +2270,8 @@ export default {
       this.uploadFilesplitEo.standNumSplit = this.sarStandardsInfoEO.lawsNumber
       this.uploadFilesplitEo.standNameSplit = this.sarStandardsInfoEO.lawsName
       this.uploadFilesplitEo.standId = this.sarStandardsInfoEO.id
-      // this.uploadFilesplitEo.fileType = this.$route.params.pageType
+      this.uploadFilesplitEo.fileType = this.$route.params.pageType
-      this.uploadFilesplitEo.fileType = this.sarStandardsInfoEO.textStatus
+      // this.uploadFilesplitEo.fileType = this.sarStandardsInfoEO.textStatus
 
       var filename = file.name
       var index1 = filename.lastIndexOf('.')

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

@@ -1384,9 +1384,18 @@ export default {
     checkedRole(data){
     if(data[0].id){
         let asdId = sessionStorage.getItem('queId')
+        const usid = data.reduce((init,item,index,arr)=>{
+          let result
+          if(index === arr.length - 1){
+            result = init + item.id
+          }else{
+            result = init + item.id + ','
+          }
+          return result
+        },'')
         this.$http.postData('lawss/AskUser/insertAskUser',{
             asdId: asdId,
-            usid:  data[0].id,
+            usid,
         },{
             _this: this
         }, res => {
@@ -1666,7 +1675,7 @@ export default {
       this.tagsLoading = true
       this.$http.get('lawss/AskQuestions/getSubscriptionByStandId',{
         standardId: this.activestand,
-        answerer: this.$store.getters.userInfo.userId,
+        answererId: this.$store.getters.userInfo.userId,
       },{
         _this: this
       }, res => {

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

@@ -1710,7 +1710,7 @@ export default {
       this.tagsLoading = true
       this.$http.get('lawss/AskQuestions/getSubscriptionByStandId',{
         standardId: this.activestand,
-        answerer: this.$store.getters.userInfo.userId,
+        answererId: this.$store.getters.userInfo.userId,
       },{
         _this: this
       }, res => {